linux-kernel - linux-next: manual merge of the tip tree with Linus' and 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]

Date:	Mon, 29 Apr 2013 15:21:49 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Matt Fleming <matt.fleming@...el.com>,
	David Howells <dhowells@...hat.com>,
	Tom Gundersen <teg@...m.no>
Subject: linux-next: manual merge of the tip tree with Linus' and the vfs
 tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/firmware/efivars.c between commits f464246d85d5 ("efivars: only
check for duplicates on the registered list") from Linus' tree and
a2162ae42bc4 ("Include missing linux/magic.h inclusions") from the vfs
tree and commits d68772b7c83f ("efivarfs: Move to fs/efivarfs") and
e14ab23dde12 ("efivars: efivar_entry API") from the tip tree.

I think that the second tip tree patch supersedes the patch in Linus'
tree.

I removed the file and applied the following fix up patch and can carry
the fix as necessary (no action is required).

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 29 Apr 2013 15:18:07 +1000
Subject: [PATCH] efivars: Include missing linux/magic.h inclusions

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 fs/efivarfs/super.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
index 34c48f1..1fa5e6d 100644
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@ -12,6 +12,7 @@
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/pagemap.h>
+#include <linux/magic.h>

 #include "internal.h"

-- 
1.8.1

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

Content of type "application/pgp-signature" skipped