From: ebiederm@xmission.com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: Re: linux-next: manual merge of the namespace tree with the m68k tree
Date: Tue, 10 May 2011 21:17:31 -0700 [thread overview]
Message-ID: <m1liydeuqs.fsf@fess.ebiederm.org> (raw)
In-Reply-To: <20110511140225.2c7e300f.sfr@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 11 May 2011 14:02:25 +1000")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 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.
Sounds good. Gert asked me to check in that conflict (probably so
bisects will continue to work), and if the commit id is right it looks
like the m68k tree is seeing active development on that change right now.
Eric
next prev parent reply other threads:[~2011-05-11 15:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-11 4:02 linux-next: manual merge of the namespace tree with the m68k tree Stephen Rothwell
2011-05-11 4:17 ` Eric W. Biederman [this message]
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=m1liydeuqs.fsf@fess.ebiederm.org \
--to=ebiederm@xmission.com \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).