On Sun, Oct 18, 2015 at 08:54:57PM +0200, Tillmann Heidsieck wrote:
> Hi,

[...]

> Greg is probably trying to apply this series to the staging-next branch of
> his staging tree[0]
> so you need to clone that one, or add it as an additional remote[1] to your
> clone of the kernel tree (much better option IMHO). After this you need to
> rebase[2] your changes onto the stating-next branch, fix up all conflicts in
> your code, and resend the patch.
> 
> I hope this helps
> 
> Tillmann
> 
> [0] https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
> [1] https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes
> [2] https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

ups, got bitten by my missing c'n'p prowess 
[2] https://www.kernel.org/pub/software/scm/git/docs/git-rebase.html
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to