linux-kernel - Re: linux-next: manual merge of the l2-mtd 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] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 29 May 2012 12:38:47 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Artem Bityutskiy <dedekind1@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sascha Hauer <s.hauer@...gutronix.de>,
	Fabio Estevam <fabio.estevam@...escale.com>,
	David Woodhouse <dwmw2@...radead.org>
Subject: Re: linux-next: manual merge of the l2-mtd tree with Linus' tree

On Tue, 29 May 2012 12:33:01 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the l2-mtd tree got a conflict in
> drivers/mtd/nand/mxc_nand.c between commit 97c3213fd9fc ("mtd mxc_nand:
> prepare/unprepare clock") from Linus' tree and commit 625bdd2a6bd0
> ("nand: mxc_nand: Use clk_prepare_enable/clk_disable_unprepare") from the
> l2-mtd tree.
> 
> The former is a superset of the latter.

Actually they modify different functions, so I fixed it up.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped