linux-kernel - linux-next: manual merge of the usb tree with the vfs 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: <20120501150416.3b900d70af5f5173908aca00@canb.auug.org.au>
Date:	Tue, 1 May 2012 15:04:16 +1000
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,
	Al Viro <viro@...iv.linux.org.uk>
Subject: linux-next: manual merge of the usb tree with the vfs tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/core/inode.c between commit eaf5fb5977e0 ("switch usbfs to
use of simple_{unlink,rmdir}") from the  tree and commit fb28d58b72aa
("USB: remove CONFIG_USB_DEVICEFS") from the usb tree.

The latter removes the file modified by the former, so I just removed the
file.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped