linux-kernel - linux-next: manual merge of the configfs tree with the 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]

Message-Id: <20090615110423.4a4d8030.sfr@canb.auug.org.au>
Date:	Mon, 15 Jun 2009 11:04:23 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Joel Becker <Joel.Becker@...cle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Louis Rilling <louis.rilling@...labs.com>
Subject: linux-next: manual merge of the configfs tree with the  tree

Hi Joel,

Today's linux-next merge of the configfs tree got a conflict in
fs/configfs/dir.c between commit 420118caa32c8ccdf9fce5a623b9de3f951573c5
("configfs: Rework configfs_depend_item() locking and make lockdep
happy") from Linus' tree and commit
8af7d5ffe1b6468ed0de1c2bb5335ad40b755ba3 ("configfs: Rework
configfs_depend_item() locking and make lockdep happy") from the configfs
tree.

Two versions of the same patch (even the same author date).  I have no
idea what to do with these, so I just took the version from Linus' tree
(since that had a slightly later commit date).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped