| 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: <20100315134110.8982a0f2.sfr@canb.auug.org.au>
Date: Mon, 15 Mar 2010 13:41:10 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Eric Paris <eparis@...hat.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Dave Young <hidave.darkstar@...il.com>
Subject: linux-next: manual merge of the fsnotify tree with Linus' tree
Hi Eric,
Today's linux-next merge of the fsnotify tree got a conflict in
kernel/sysctl.c between commits 5ed109103d73b0bafc92e860cead56725231384d
("sysctl extern cleanup: module") and
15485a4682d1d3bfee2aa78b4b1a5d36f5746b64 ("sysctl extern cleanup: sg")
from Linus' tree and commit 00e4382acdbe8337cd00d3ed74a6150f0a647d1f
("sysctl extern cleanup: inotify") from the fsnotify tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc kernel/sysctl.c
index 8686b0f,a7a3634..0000000
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -128,6 -120,17 +129,10 @@@ static int min_percpu_pagelist_fract =
static int ngroups_max = NGROUPS_MAX;
-#ifdef CONFIG_MODULES
-extern char modprobe_path[];
-extern int modules_disabled;
-#endif
+ #ifdef CONFIG_INOTIFY_USER
+ #include <linux/inotify.h>
+ #endif
-#ifdef CONFIG_CHR_DEV_SG
-extern int sg_big_buff;
-#endif
+
#ifdef CONFIG_SPARC
#include <asm/system.h>
#endif
--
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