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

Date:	Wed, 31 Mar 2010 16:03:08 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Paul Mundt <lethal@...ux-sh.org>
Subject: linux-next: manual merge of the driver-core tree with the sh tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/platform.c between commit
bd05086bbe3f241cd552068f9ceba9e19c6ce427 ("driver core: Convert to
kasprintf() for early dev_name()") from the sh tree and commit
d08bd4bf3c0d8ea211eae36ab849787d67cb35e4 ("driver core: Early dev_name()
support") from the driver-core tree (which is also in the sh tree).

I used the version from the sh tree.  Paul, you should submit that patch
to Greg (if you haven't already).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped