From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jeff Layton <jlayton@redhat.com>
Subject: linux-next: manual merge of the signal tree with the vfs tree
Date: Fri, 12 Oct 2012 15:00:41 +1100 [thread overview]
Message-ID: <20121012150041.5831853d10f2ef0694a5d2f4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 524 bytes --]
Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/m68k/kernel/process.c between commit 2a5e5beb88c5 ("vfs: define
struct filename and have getname() return it") from the vfs tree and
commit d878d6dacee2 ("m68k: switch to generic sys_execve()/kernel_execve()")
from the signal tree.
The latter removed the function that the latter modified, so I did that
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-10-12 4:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-12 4:00 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-04-04 5:41 linux-next: manual merge of the signal tree with the vfs tree Stephen Rothwell
2013-04-04 5:41 Stephen Rothwell
2012-10-12 4:09 Stephen Rothwell
2012-10-12 4:06 Stephen Rothwell
2012-10-12 4:02 Stephen Rothwell
2012-10-12 3:58 Stephen Rothwell
2012-10-12 3:56 Stephen Rothwell
2012-10-02 5:48 Stephen Rothwell
2012-09-28 5:56 Stephen Rothwell
2012-09-28 11:56 ` Al Viro
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=20121012150041.5831853d10f2ef0694a5d2f4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jlayton@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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).