linux-kernel - linux-next: manual merge of the akpm tree with the vfs 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: <20130429183428.d420f496ba32b0aef7856fb6@canb.auug.org.au>
Date:	Mon, 29 Apr 2013 18:34:28 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Howells <dhowells@...hat.com>,
	Al Viro <viro@...iv.linux.org.uk>,
	HoSung Jung <rain6557@...il.com>
Subject: linux-next: manual merge of the akpm tree with the vfs tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in ipc/msgutil.c
between commit b3ecda5869da ("proc: Split the namespace stuff out into
linux/proc_ns.h") from the vfs tree and commit "ipc/msgutil.c: use
linux/uaccess.h" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc ipc/msgutil.c
index a53f38f,d43439e..0000000
--- a/ipc/msgutil.c
+++ b/ipc/msgutil.c
@@@ -16,8 -16,8 +16,8 @@@
  #include <linux/msg.h>
  #include <linux/ipc_namespace.h>
  #include <linux/utsname.h>
 -#include <linux/proc_fs.h>
 +#include <linux/proc_ns.h>
- #include <asm/uaccess.h>
+ #include <linux/uaccess.h>
  
  #include "util.h"
  

Content of type "application/pgp-signature" skipped