Messages in this thread | | | Date | Mon, 17 May 2010 15:19:22 -0700 | From | Yinghai <> | Subject | Re: [PATCH 15/35] x86, lmb: Add lmb_reserve_area_overlap_ok() |
| |
On 05/17/2010 03:01 PM, Benjamin Herrenschmidt wrote: > On Mon, 2010-05-17 at 10:18 -0700, Yinghai wrote: >>> No. Both will hit 2.6.36. It's way too late to queue up such changes >> for >>> the 2.6.35 merge window which has already opened. >> >> i have feeling that your new LMB code will hit 2.6.36. and >> x86 patches that is using to lmb will hit 2.6.37. >> >> otherwise it will make more merge conflicts between tip and lmb. >> unless put your lmb change to tip? > > There is no reason not to, I'll have them in a separate branch that Ingo > can pull. I think we can aim for 2.6.36 in one go provided that Peter > and Thomas are happy with the x86 side of things.
great.
Thanks
Yinghai
| |