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

Date:	Tue, 21 Sep 2010 16:06:37 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sven Eckelmann <sven.eckelmann@....de>,
	"Greg Kroah-Hartman" <gregkh@...e.de>
Subject: linux-next: manual merge of the bkl-llseek tree with the
 staging-next tree

Hi Arnd,

Today's linux-next merge of the bkl-llseek tree got conflicts in
drivers/staging/batman-adv/icmp_socket.c and
drivers/staging/batman-adv/bat_debugfs.c between commit
2d77bb592f6cabc5ee5322c03ee92b9f96c45f60 ("Staging: batman-adv: Mark
debugfs files as nonseekable") from the staging-next tree and commit
5295184fb318693b4ef2cd8056bf1a7cb43586d7 ("llseek: automatically
add .llseek fop") from the bkl-llseek tree.

I used the versions from the staging-next tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped