From mboxrd@z Thu Jan 1 00:00:00 1970 From: u.kleine-koenig@pengutronix.de (Uwe =?iso-8859-1?Q?Kleine-K=F6nig?=) Date: Mon, 1 Mar 2010 11:27:27 +0100 Subject: [GIT PULL] pxa: patches for next merge window In-Reply-To: <20100301101140.GA12088@linux-sh.org> References: <20100225205113.GF3101@n2100.arm.linux.org.uk> <20100225212915.GA24043@n2100.arm.linux.org.uk> <20100228161449.GD16745@n2100.arm.linux.org.uk> <20100301093927.GC29952@pengutronix.de> <20100301094820.GA10863@n2100.arm.linux.org.uk> <20100301101140.GA12088@linux-sh.org> Message-ID: <20100301102727.GC16049@pengutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, > Out of the non-PXA merge requests, the only conflicts seem to be on > Kconfig/Makefile bits as usual, being fairly insular beyond that. While > these are fairly easy to sort out, Only a nice hint to whoever will merge the different arm trees in the end: Note that next is (or recently was) broken, because git merged two arm trees successfully (i.e. didn't result in a conflict) according to Stephen and broke arch/arm/Kconfig with it. See http://thread.gmane.org/gmane.linux.ports.arm.kernel/75250 for the exact details. (I don't know if Stephen reports these issues to Linus anyhow, so this mail might have been sent for nothing.) Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |