From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Herrenschmidt Subject: Re: [PATCH 15/35] x86, lmb: Add lmb_reserve_area_overlap_ok() Date: Tue, 18 May 2010 08:01:26 +1000 Message-ID: <1274133686.21352.755.camel@pasglop> References: <1273796396-29649-1-git-send-email-yinghai@kernel.org> <1273796396-29649-16-git-send-email-yinghai@kernel.org> <1273804337.21352.396.camel@pasglop> <4BECF158.5070200@oracle.com> <1273825807.21352.601.camel@pasglop> <4BED7CE3.1020507@oracle.com> <1273876234.21352.639.camel@pasglop> <20100515073231.GB9877@elte.hu> <1274056773.21352.700.camel@pasglop> <4BF0DE0C.2000905@oracle.com> <1274081072.21352.718.camel@pasglop> <4BF17A50.1050905@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4BF17A50.1050905@oracle.com> Sender: linux-kernel-owner@vger.kernel.org To: Yinghai Cc: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org List-Id: linux-arch.vger.kernel.org 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. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org ([63.228.1.57]:41338 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752801Ab0EQWDv (ORCPT ); Mon, 17 May 2010 18:03:51 -0400 Subject: Re: [PATCH 15/35] x86, lmb: Add lmb_reserve_area_overlap_ok() From: Benjamin Herrenschmidt In-Reply-To: <4BF17A50.1050905@oracle.com> References: <1273796396-29649-1-git-send-email-yinghai@kernel.org> <1273796396-29649-16-git-send-email-yinghai@kernel.org> <1273804337.21352.396.camel@pasglop> <4BECF158.5070200@oracle.com> <1273825807.21352.601.camel@pasglop> <4BED7CE3.1020507@oracle.com> <1273876234.21352.639.camel@pasglop> <20100515073231.GB9877@elte.hu> <1274056773.21352.700.camel@pasglop> <4BF0DE0C.2000905@oracle.com> <1274081072.21352.718.camel@pasglop> <4BF17A50.1050905@oracle.com> Content-Type: text/plain; charset="UTF-8" Date: Tue, 18 May 2010 08:01:26 +1000 Message-ID: <1274133686.21352.755.camel@pasglop> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: Yinghai Cc: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Message-ID: <20100517220126.bK2qykFKAVB4Il9N9HcYSyvLRHGU-pzNV_85OOpd3jU@z> 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.