[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1274133686.21352.755.camel@pasglop>
Date: Tue, 18 May 2010 08:01:26 +1000
From: Benjamin Herrenschmidt <benh@...nel.crashing.org>
To: Yinghai <yinghai.lu@...cle.com>
Cc: Ingo Molnar <mingo@...e.hu>, Thomas Gleixner <tglx@...utronix.de>,
"H. Peter Anvin" <hpa@...or.com>,
Andrew Morton <akpm@...ux-foundation.org>,
David Miller <davem@...emloft.net>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Johannes Weiner <hannes@...xchg.org>,
linux-kernel@...r.kernel.org, linux-arch@...r.kernel.org
Subject: Re: [PATCH 15/35] x86, lmb: Add lmb_reserve_area_overlap_ok()
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.
Cheers,
Ben.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists