From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Matt Fleming <matt.fleming@intel•com>,
David Howells <dhowells@redhat•com>, Tom Gundersen <teg@jklm•no>
Subject: linux-next: manual merge of the tip tree with Linus' and the vfs tree
Date: Mon, 29 Apr 2013 15:21:49 +1000 [thread overview]
Message-ID: <20130429152149.d5bb408bf88bf46232282419@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1284 bytes --]
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@canb•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@canb•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@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
reply other threads:[~2013-04-29 5:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130429152149.d5bb408bf88bf46232282419@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=matt.fleming@intel$(echo .)com \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=teg@jklm$(echo .)no \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox