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  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]
Date:	Mon, 15 Mar 2010 13:41:10 +1100
From:	Stephen Rothwell <>
To:	Eric Paris <>
	Dave Young <>
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.
Stephen Rothwell          

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;
 -extern char modprobe_path[];
 -extern int modules_disabled;
+ #include <linux/inotify.h>
+ #endif
 -extern int sg_big_buff;
  #include <asm/system.h>
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at

Powered by blists - more mailing lists