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

Date:	Mon, 18 Jan 2010 18:49:56 +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,
	Andi Kleen <andi@...stfloor.org>,
	Wu Fengguang <fengguang.wu@...el.com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the driver-core tree with Linus' tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/memory.c between commit
8ff410daa009c4b44be445ded5b0cec00abc0426 ("sysdev: fix prototype for
memory_sysdev_class show/store functions") from Linus' tree and commits
95f4918fb2826dd7fc7be8a375ee0b71e8276a62 ("sysdev: Fix type of sysdev
class attribute in memory driver") and
18a994bc1df640e77b853af5b6a175d6871b449f ("driver-core: Add attribute
argument to class_attribute show/store") from the driver-core tree.

Not a big suprise.  I fixed it up by using the driver-core tree version
(effectively reverting the version in Linus' tree).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped