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

Message-Id: <20110927162919.1bf769d918a16a35d91ac1da@canb.auug.org.au>
Date:	Tue, 27 Sep 2011 16:29:19 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Linus Walleij <linus.walleij@...aro.org>,
	Samuel Ortiz <sameo@...ux.intel.com>
Subject: linux-next: manual merge of the moduleh tree with the mfd tree

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/mfd/ab3550-core.c between commit e085f9a2e27d ("mfd: Delete
ab3550 driver") from the mfd tree and commit afb68c4877b2 ("mfd: Add
module.h to the implicit drivers/mfd users") from the moduleh tree.

The former removes this file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped