Rebase against linux-next tree?

[Greg KH]

On Tue, Mar 14, 2017 at 07:52:36PM -0600, Perry Hooker wrote:
> I recently submitted a patch (attached below) that corrects a couple
> of 'sparse' warnings in drivers/staging/rtl8192u/r8192U_dm.c.
> 
> I got this reply back from greg k-h:
> 
> > This patch does not apply to my tree at all :(
> > Please rebase it against linux-next and try again.
> 
> However,  I thought I *was* working off linux-next. This is what I did:
> 
> $ git remote add linux-next
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> $ git fetch linux-next
> $ git fetch --tags linux-next
> $ git remote update
> $ git checkout next-20170310
> $ git apply 0001-staging-rtl8192u-use-__le16_to_cpu-instead-of-cast.patch
> 
> ... and the patch applied ok.
> Just to be sure, I also did this:
> 
> $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> $ git apply 0001-staging-rtl8192u-use-__le16_to_cpu-instead-of-cast.patch
> 
> ... and the patch again applied OK.
> 
> What am I doing wrong / where should I go for more info?

linux-next is usually a day or so behind my tree, so maybe there were
other patches from other developers that caused the conflict.  Try
linux-next now and see if there still is a conflict or not, and if not,
rebase and resend the patches.

If you really want to do a lot of staging tree work, I suggest working
off of my staging-next or staging-testing branch.  Note, sometimes
staging-testing gets rebased, so unless you know how to handle that, I
would stay away from it :)

That's the fun of dealing with a subsystem that gets a few hundred
patches submitted every day, it moves fast...

thanks,

greg k-h