linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the mmc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <87pqbdr1md.fsf@laptop.org>
Date:	Thu, 12 Apr 2012 00:54:34 -0400
From:	Chris Ball <cjb@...top.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Sascha Hauer <s.hauer@...gutronix.de>,
	Nicolas Ferre <nicolas.ferre@...el.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the mmc tree

Hi,

On Thu, Apr 12 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/mmc/host/Kconfig between commit a334b9550294 ("mmc: remove imxmmc
> driver") from the mmc tree and commits a21a92c0c787 ("mmc: Kconfig: remove
> choice between at91_mci and atmel-mci") and 62080f06de6b ("mmc:
> atmel-mci: remove the need for CONFIG_MMC_ATMELMCI_DMA") from the arm-soc
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, Stephen.

Nicolas and Arnd, these MMC Kconfig patches weren't sent to me or
linux-mmc@ for review, so I haven't seen them before.  They look
fine, but I'd like to be in the loop directly to avoid surprises.

Do these MMC patches have any dependency on other work?  It doesn't
look like it.  If that's so, I'd rather carry them in the MMC tree
to save Stephen and Linus from dealing with the merge conflict.

- Chris.
-- 
Chris Ball   <cjb@...top.org>   <http://printf.net/>
One Laptop Per Child
--
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/