linux-kernel - linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs 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: <20100427150604.2ad0b3fe.sfr@canb.auug.org.au>
Date:	Tue, 27 Apr 2010 15:06:04 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Frédéric Weisbecker" <fweisbec@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Arnd Bergmann <arnd@...db.de>,
	Linus Torvalds <torvalds@...ux-foundation.org>
Subject: linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs
 tree

Hi Frédéric,

Today's linux-next merge of the bkl-ioctl tree got conflicts in
drivers/char/i8k.c, net/sunrpc/cache.c and
drivers/isdn/divert/divert_procfs.c between commit
64ef834551d7696f54553d7608eba80a5a800e77 ("procfs: Push down the bkl from
ioctl") from the bkl-procfs tree and commit
1dd97d3d546aa14db7efa5366b21d1336b91379e ("Rename 'struct
file_operations' 'ioctl' fn pointer to 'bkl_ioctl'") from the bkl-ioctl
tree.

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

Content of type "application/pgp-signature" skipped