Re: [PATCH 1/1] Staging: android: ion: Remove explicit NULL comparison using Coccinelle

From: Greg KH
Date: Sun Oct 02 2016 - 12:16:39 EST


On Sun, Oct 02, 2016 at 09:37:17PM +0530, Shyam Saini wrote:
> On Sun, 2016-10-02 at 17:37 +0200, Greg KH wrote:
> > On Sun, Oct 02, 2016 at 08:51:29PM +0530, Shyam Saini wrote:
> > >
> > > On Sun, 2016-10-02 at 16:58 +0200, Greg KH wrote:
> > > >
> > > > On Wed, Sep 28, 2016 at 08:58:51PM +0530, shyam saini wrote:
> > > > >
> > > > >
> > > > > Remove the explicit NULL comparison and rewrite in a compact
> > > > > form.
> > > > >
> > > > > Signed-off-by: shyam saini <mayhs11saini@xxxxxxxxx>
> > > > > ---
> > > > >  drivers/staging/android/ion/ion_of.c | 2 +-
> > > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > Does not apply to my tree :(
> > >
> > > Do I need to rebase it? Because I have already included all the
> > > maintainers in the patch which I got from
> > >  scripts/get_maintainer.pl.
> > If you want it applied, yes, you need to rebase it.  Listing the
> > maintainers doesn't help the patch to somehow magically be able to be
> > applied to the tree :)
> >
> > Please work against my staging-testing branch of the staging.git
> > tree,
> > as it has a lot of patches I just accepted in it that are not yet in
> > linux-next.
> >
> > thanks,
> >
> > greg k-h
>
>
> >From now onward I will be working on your staging-testing tree. 
>
> But then why some of my patches which were based on linux-next were
> accepted?
>
> for example today You've accepted 
> my patch "Staging: vt6655: Remove explicit NULL comparison using
> Coccinelle"
>
> with commit id  4d932504b534584e116b400dd6e7b8ce7deb455c, 
>
> which you can check on 
>  git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
>
> This patch was based on linux-next tree.

Because maybe others have sent patches in for this specific area of the
kernel, or there are changes made by other developer's trees (like the
iio maintainer) for this driver. linux-next merges all of our trees
together, and usually is the correct thing to use. But sometimes it
doesn't work out due to the large number of patches I get for the
staging tree (about 20-50 a day, sometimes more.)

thanks,

greg k-h