Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932181Ab3GBGAr (ORCPT ); Tue, 2 Jul 2013 02:00:47 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:49182 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750887Ab3GBGAp (ORCPT ); Tue, 2 Jul 2013 02:00:45 -0400 MIME-Version: 1.0 X-Originating-IP: [173.13.129.225] In-Reply-To: <20980858CB6D3A4BAE95CA194937D5E73E9E3BF5@DBDE04.ent.ti.com> References: <20130702152954.f25bbf51c1a79aa4437e22ee@canb.auug.org.au> <20980858CB6D3A4BAE95CA194937D5E73E9E3BF5@DBDE04.ent.ti.com> Date: Mon, 1 Jul 2013 23:00:44 -0700 Message-ID: Subject: Re: linux-next: manual merge of the arm-soc tree with the l2-mtd tree From: Olof Johansson To: "Gupta, Pekon" , Artem Bityutskiy Cc: Stephen Rothwell , Arnd Bergmann , "linux-arm-kernel@lists.infradead.org" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Mark Jackson , Tony Lindgren Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1814 Lines: 45 On Mon, Jul 1, 2013 at 10:44 PM, Gupta, Pekon wrote: >> >> Hi all, >> >> Today's linux-next merge of the arm-soc tree got a conflict in >> Documentation/devicetree/bindings/mtd/gpmc-nand.txt between commits >> 6c88058ef927 ("ARM: OMAP2+: cleaned-up DT support of various ECC >> schemes") and 212012138deb ("mtd: nand: omap2: updated support for >> BCH4 >> ECC scheme") from the l2-mtd tree and commit 496c8a0bbb72 ("ARM: >> OMAP2+: >> Allow NAND transfer mode to be specified in DT") from the arm-soc tree. >> >> I fixed it up (maybe - see below) and can carry the fix as necessary (no >> action is required). >> >> -- >> Cheers, >> Stephen Rothwell sfr@canb.auug.org.au >> > Yes following merge is correct. Apologies, as there were multiple OMAP2 NAND and GPMC updates and clean-up going into different trees, so these conflict came. Going forward you shouldn't find such issues, as code is more stable now. Thanks for help. > > with regards, pekon Sigh. The new bindings seem to never have been reviewed by any device tree maintainers, and from the look of it, it might need some discussion. It wasn't even cc:d to devicetree-discuss. It's completely inappropriate to merge a patch like this at this time without any kind of acks from the people reviewing bindings. Can it please be dropped ASAP from the MTD tree? Thanks! Or, if you want it in different wording: The mtd-tree patch is a strong NAK until this has been sorted out. It was also applied today, after the merge window opened. Don't merge it for 3.11. Artem? -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/