| 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
| ||
|
Message-Id: <20100921161031.7745150e.sfr@canb.auug.org.au>
Date: Tue, 21 Sep 2010 16:10:31 +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,
Ben Greear <greearb@...delatech.com>,
Steve French <smfrench@...il.com>,
<linux-cifs@...r.kernel.org>, Jan Blunck <jblunck@...radead.org>
Subject: linux-next: manual merge of the bkl-vfs tree with the cifs tree
Hi Arnd,
Today's linux-next merge of the bkl-vfs tree got a conflict in
fs/cifs/cifsfs.c between commit d090dbeacd3763845d83d5de4d85aad025a28677
("cifs: Allow binding to local IP address") from the cifs tree and commit
b8f05b0b9ea89cfaf6759b1eb47fff683e7016a5 ("BKL: Remove BKL from CifsFS")
from the bkl-vfs tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc fs/cifs/cifsfs.c
index 52e89ea,4e273f7..0000000
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@@ -35,8 -35,6 +35,7 @@@
#include <linux/delay.h>
#include <linux/kthread.h>
#include <linux/freezer.h>
- #include <linux/smp_lock.h>
+#include <net/ipv6.h>
#include "cifsfs.h"
#include "cifspdu.h"
#define DECLARE_GLOBALS_HERE
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists