linux-kernel - linux-next: manual merge of the mfd 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 for Android: free password hash cracker in your pocket

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

Date:	Thu, 13 Nov 2014 12:47:56 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Lee Jones <lee.jones@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Johan Hovold <johan@...nel.org>
Subject: linux-next: manual merge of the mfd tree with Linus' tree

Hi Lee,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/viperboard.c between commit b6684228726c ("mfd: viperboard:
Fix platform-device id collision") from Linus' tree and commit
5e65ea8c48e6 ("mfd: Use mfd_add_hotplug_devices() helper") from the mfd
tree.

I fixed it up (I just used the version from the mfd tree) and can carry
the fix as necessary (no action is required).

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

Content of type "application/pgp-signature" skipped