linux-kernel - Re: linux-next: manual merge of the mmc tree with Linus' 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] [day] [month] [year] [list]

Message-ID: <31979761-213c-4b65-b14a-b6ef3b2ca60d@AM1EHSMHS002.ehs.local>
Date:	Mon, 13 Jan 2014 09:11:41 -0800
From:	Sören Brinkmann <soren.brinkmann@...inx.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Chris Ball <chris@...ntf.net>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>,
	Michal Simek <michal.simek@...inx.com>
Subject: Re: linux-next: manual merge of the mmc tree with Linus' tree

On Mon, Jan 13, 2014 at 01:17:00PM +1100, Stephen Rothwell wrote:
> Hi Chris,
> 
> Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS
> between commit c2fd4e380322 ("MAINTAINERS: set up proper record for
> Xilinx Zynq") from Linus' tree and commit 45f210424b4b ("mmc: arasan: Add
> driver for Arasan SDHCI") from the mmc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

The fix is correct, AFAICT.

	Thanks,
	Sören


--
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/