From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: [PATCH v2 00/34] i.MX multi-platform support Date: Thu, 20 Sep 2012 15:56:56 +0000 Message-ID: <201209201556.57171.arnd@arndb.de> References: <1348123547-31082-1-git-send-email-shawn.guo@linaro.org> <201209200739.34899.arnd@arndb.de> <20120920145342.GI2450@S2101-09.ap.freescale.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.171]) by alsa0.perex.cz (Postfix) with ESMTP id 3092C265364 for ; Thu, 20 Sep 2012 17:57:04 +0200 (CEST) In-Reply-To: <20120920145342.GI2450@S2101-09.ap.freescale.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Shawn Guo Cc: alsa-devel@alsa-project.org, Mark Brown , Artem Bityutskiy , linux-fbdev@vger.kernel.org, Wim Van Sebroeck , linux-mtd@lists.infradead.org, linux-i2c@vger.kernel.org, Florian Tobias Schandinat , Paulius Zaleckas , Chris Ball , linux-media@vger.kernel.org, linux-watchdog@vger.kernel.org, rtc-linux@googlegroups.com, Sascha Hauer , Rob Herring , linux-arm-kernel@lists.infradead.org, Vinod Koul , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-mmc@vger.kernel.org, Wolfram Sang , Javier Martin , Andrew Morton , Guennadi List-Id: alsa-devel@alsa-project.org On Thursday 20 September 2012, Shawn Guo wrote: > > On Thu, Sep 20, 2012 at 07:39:34AM +0000, Arnd Bergmann wrote: > > The first five branches are scheduled to go through the arm-soc tree, so > > I'm fine with that. For the sound/for-3.7 branch, I'd like to know when > > to expect that hitting mainline. If it always gets in very early during the > > merge window, it's probably ok to put the imx/multi-platform patches into > > the same branch as the other ones in arm-soc and wait for the sound stuff > > to hit mainline first, otherwise I'd suggest we start a second > > next/multiplatform-2 branch for imx and send the first part early on > > but then wait with the second batch before sound gets in. > > > It seems that we will have to go with next/multiplatform-2. I just > tried to merge the series with linux-next together, and got some > non-trivial conflicts with media and mtd tree. I might have to rebase > my series on top of these trees to sort out those conflicts. That said, > I will have several dependencies outside arm-soc tree, and have to pend > my series until all those trees get merged into mainline. Ok, fair enough. I think we can put it in arm-soc/for-next as a staging branch anyway to give it some exposure to linux-next, and then we can decide whether a rebase is necessary before sending it to Linus. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann To: Shawn Guo Subject: Re: [PATCH v2 00/34] i.MX multi-platform support Date: Thu, 20 Sep 2012 15:56:56 +0000 References: <1348123547-31082-1-git-send-email-shawn.guo@linaro.org> <201209200739.34899.arnd@arndb.de> <20120920145342.GI2450@S2101-09.ap.freescale.net> In-Reply-To: <20120920145342.GI2450@S2101-09.ap.freescale.net> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201209201556.57171.arnd@arndb.de> Cc: alsa-devel@alsa-project.org, Mark Brown , Artem Bityutskiy , linux-fbdev@vger.kernel.org, Wim Van Sebroeck , linux-mtd@lists.infradead.org, linux-i2c@vger.kernel.org, Florian Tobias Schandinat , Paulius Zaleckas , Chris Ball , linux-media@vger.kernel.org, linux-watchdog@vger.kernel.org, rtc-linux@googlegroups.com, Sascha Hauer , Rob Herring , linux-arm-kernel@lists.infradead.org, Vinod Koul , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-mmc@vger.kernel.org, Wolfram Sang , Javier Martin , Andrew Morton , Guennadi Liakhovetski List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Thursday 20 September 2012, Shawn Guo wrote: > > On Thu, Sep 20, 2012 at 07:39:34AM +0000, Arnd Bergmann wrote: > > The first five branches are scheduled to go through the arm-soc tree, so > > I'm fine with that. For the sound/for-3.7 branch, I'd like to know when > > to expect that hitting mainline. If it always gets in very early during the > > merge window, it's probably ok to put the imx/multi-platform patches into > > the same branch as the other ones in arm-soc and wait for the sound stuff > > to hit mainline first, otherwise I'd suggest we start a second > > next/multiplatform-2 branch for imx and send the first part early on > > but then wait with the second batch before sound gets in. > > > It seems that we will have to go with next/multiplatform-2. I just > tried to merge the series with linux-next together, and got some > non-trivial conflicts with media and mtd tree. I might have to rebase > my series on top of these trees to sort out those conflicts. That said, > I will have several dependencies outside arm-soc tree, and have to pend > my series until all those trees get merged into mainline. Ok, fair enough. I think we can put it in arm-soc/for-next as a staging branch anyway to give it some exposure to linux-next, and then we can decide whether a rebase is necessary before sending it to Linus. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from moutng.kundenserver.de ([212.227.126.171]:56355 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751221Ab2ITP5G (ORCPT ); Thu, 20 Sep 2012 11:57:06 -0400 From: Arnd Bergmann To: Shawn Guo Subject: Re: [PATCH v2 00/34] i.MX multi-platform support Date: Thu, 20 Sep 2012 15:56:56 +0000 Cc: linux-arm-kernel@lists.infradead.org, Sascha Hauer , Javier Martin , Rob Herring , Mark Brown , alsa-devel@alsa-project.org, Florian Tobias Schandinat , linux-fbdev@vger.kernel.org, Chris Ball , linux-mmc@vger.kernel.org, Guennadi Liakhovetski , linux-media@vger.kernel.org, Andrew Morton , rtc-linux@googlegroups.com, Artem Bityutskiy , linux-mtd@lists.infradead.org, Wolfram Sang , linux-i2c@vger.kernel.org, Wim Van Sebroeck , linux-watchdog@vger.kernel.org, "Greg Kroah-Hartman" , linux-usb@vger.kernel.org, Vinod Koul , Paulius Zaleckas References: <1348123547-31082-1-git-send-email-shawn.guo@linaro.org> <201209200739.34899.arnd@arndb.de> <20120920145342.GI2450@S2101-09.ap.freescale.net> In-Reply-To: <20120920145342.GI2450@S2101-09.ap.freescale.net> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201209201556.57171.arnd@arndb.de> Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.org On Thursday 20 September 2012, Shawn Guo wrote: > > On Thu, Sep 20, 2012 at 07:39:34AM +0000, Arnd Bergmann wrote: > > The first five branches are scheduled to go through the arm-soc tree, so > > I'm fine with that. For the sound/for-3.7 branch, I'd like to know when > > to expect that hitting mainline. If it always gets in very early during the > > merge window, it's probably ok to put the imx/multi-platform patches into > > the same branch as the other ones in arm-soc and wait for the sound stuff > > to hit mainline first, otherwise I'd suggest we start a second > > next/multiplatform-2 branch for imx and send the first part early on > > but then wait with the second batch before sound gets in. > > > It seems that we will have to go with next/multiplatform-2. I just > tried to merge the series with linux-next together, and got some > non-trivial conflicts with media and mtd tree. I might have to rebase > my series on top of these trees to sort out those conflicts. That said, > I will have several dependencies outside arm-soc tree, and have to pend > my series until all those trees get merged into mainline. Ok, fair enough. I think we can put it in arm-soc/for-next as a staging branch anyway to give it some exposure to linux-next, and then we can decide whether a rebase is necessary before sending it to Linus. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Thu, 20 Sep 2012 15:56:56 +0000 Subject: [PATCH v2 00/34] i.MX multi-platform support In-Reply-To: <20120920145342.GI2450@S2101-09.ap.freescale.net> References: <1348123547-31082-1-git-send-email-shawn.guo@linaro.org> <201209200739.34899.arnd@arndb.de> <20120920145342.GI2450@S2101-09.ap.freescale.net> Message-ID: <201209201556.57171.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thursday 20 September 2012, Shawn Guo wrote: > > On Thu, Sep 20, 2012 at 07:39:34AM +0000, Arnd Bergmann wrote: > > The first five branches are scheduled to go through the arm-soc tree, so > > I'm fine with that. For the sound/for-3.7 branch, I'd like to know when > > to expect that hitting mainline. If it always gets in very early during the > > merge window, it's probably ok to put the imx/multi-platform patches into > > the same branch as the other ones in arm-soc and wait for the sound stuff > > to hit mainline first, otherwise I'd suggest we start a second > > next/multiplatform-2 branch for imx and send the first part early on > > but then wait with the second batch before sound gets in. > > > It seems that we will have to go with next/multiplatform-2. I just > tried to merge the series with linux-next together, and got some > non-trivial conflicts with media and mtd tree. I might have to rebase > my series on top of these trees to sort out those conflicts. That said, > I will have several dependencies outside arm-soc tree, and have to pend > my series until all those trees get merged into mainline. Ok, fair enough. I think we can put it in arm-soc/for-next as a staging branch anyway to give it some exposure to linux-next, and then we can decide whether a rebase is necessary before sending it to Linus. Arnd