Messages in this thread | | | Date | Thu, 14 Jan 2010 17:29:21 -0800 | From | Greg KH <> | Subject | Re: [PATCH 00/15] Staging: Convert the semaphore mess |
| |
On Mon, Jan 11, 2010 at 09:51:39PM +0100, John Kacur wrote: > Thomas / Ingo / Greg > > I started with the patch in -rt 041e3130496f31d0cb4887fc6183117e662f5141 > and tried to forward port it to 2.6.33-rc3 > > The patch no-longer applied, because some of the changes were already accepted > upstream, some files had been moved or dropped and so on. > > So, I broke the original patch into one patch per file, and fixed merge errors. > Then I also went and changed similar problems in new code > > This code should be queued-up for the 2.6.34 merge window, and should also > be applied to the latests -rt branch.
I can't do that, as it breaks when applying to Linus's latest tree, right?
If this needs to go through some other tree, no objection from me at all, feel free to add: Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
to them.
thanks,
greg k-h
| |