[PATCH 1/1] Staging: ti-st: remove st_get_plat_device

Greg KH gregkh at suse.de
Fri Sep 24 20:18:18 UTC 2010


On Sat, Sep 25, 2010 at 01:33:05AM +0530, Savoy, Pavan wrote:
> 
> 
> Greg,
>  
> 
> > -----Original Message-----
> > From: Greg KH [mailto:gregkh at suse.de]
> > Sent: Friday, September 24, 2010 2:57 PM
> > To: Savoy, Pavan
> > Cc: devel at linuxdriverproject.org; Anca Emanuel
> > Subject: Re: [PATCH 1/1] Staging: ti-st: remove st_get_plat_device
> > 
> > On Sat, Sep 25, 2010 at 01:19:43AM +0530, Savoy, Pavan wrote:
> > >
> > >
> > > > -----Original Message-----
> > > > From: Greg Kroah-Hartman [mailto:gregkh at suse.de]
> > > > Sent: Friday, September 24, 2010 1:14 PM
> > > > To: devel at linuxdriverproject.org
> > > > Cc: Savoy, Pavan; Anca Emanuel; Greg Kroah-Hartman
> > > > Subject: [PATCH 1/1] Staging: ti-st: remove st_get_plat_device
> > >
> > > Again? Can I know what is going on?
> > > The patch was merged long time ago in linux-next and that's it.
> > > The application of the patch _NOW_ on the existing HEAD/source is
> > > causing problems, and hence ti-st drivers are not building.
> > 
> > WHAT?
> > 
> > I was told that this needed to be in Linus's tree now, to fix build
> > problems that people were having.  Like the one for the Ubuntu kernel.
> > 
> > Yes, it's already in linux-next, but that's not a problem, we can handle
> > the merge.
> 
> There's the problem, the merge has not been handled, which has caused
> the build to break on Stephen rothwell's linux-next.
> Also why is it explicitly required to post this patch to .36? Wouldn't
> it flow into linus's tree from linux-next?

I did it because I was told that Linus's tree was broken at the moment
and it needed this patch.

I'll handle the merge issues later.

> > Do you NOT want this in Linus's tree for the .36 kernel release?
> > 
> > totally confused,
> 
> The confusion has created because of a short-cut this patch takes to
> go into linus's tree.  The path patches for ti-st/ used to take was
> Greg's staging-next --> Stephen Rothwell's linux-next --> Linus's main
> tree.

No, nothing flows from linux-next into Linus's tree automatically, it
needs to come from the subsystem maintainer.  In this case, me.


> I always used to rebase/build/verify on Stephen Rothwell's tree. Now
> the tree has this redundant patch "remove st_get_plat_device" - which
> causes build to break - and rolls back my sources to about 1 month
> back :(

Redundant?

{sigh}

Ok, for Linus's tree, should this patch NOT go into it for the .36
release, or SHOULD it go into it?

We will worry about the merge issues later, I'm concerned about Linus's
tree right now.

thanks,

greg k-h



More information about the devel mailing list