From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Geert Uytterhoeven <geert@linux-m68k•org>
Subject: linux-next: manual merge of the namespace tree with the m68k tree
Date: Wed, 11 May 2011 14:02:25 +1000 [thread overview]
Message-ID: <20110511140225.2c7e300f.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
Hi Eric,
Today's linux-next merge of the namespace tree got a conflict in
arch/m68k/kernel/entry_mm.S between commit 55e1af1ab184 ("m68k: Merge mmu
and non-mmu versions of sys_call_table") from the m68k tree and commit
e975ee91dcc1 ("ns: Wire up the setns system call") from the namespace
tree.
I just used the m68k version of that file and that should be all that is
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-05-11 15:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-11 4:02 Stephen Rothwell [this message]
2011-05-11 4:17 ` linux-next: manual merge of the namespace tree with the m68k tree Eric W. Biederman
2011-05-11 7:36 ` Geert Uytterhoeven
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=20110511140225.2c7e300f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ebiederm@xmission$(echo .)com \
--cc=geert@linux-m68k$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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