From: Al Viro <viro@ZenIV.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alex Kelly <alex.page.kelly@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the signal tree with the vfs tree
Date: Fri, 28 Sep 2012 12:56:35 +0100 [thread overview]
Message-ID: <20120928115635.GE13973@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20120928155639.aadab0554080381b4c38a847@canb.auug.org.au>
On Fri, Sep 28, 2012 at 03:56:39PM +1000, Stephen Rothwell wrote:
> Hi Al,
>
> Today's linux-next merge of the signal tree got a conflict in fs/exec.c
> between commit 5b8a94d461a7 ("coredump: move core dump functionality into
> its own file") from the vfs tree and commits 70446600fa12 ("arm:
> introduce ret_from_kernel_execve(), switch to generic kernel_execve()")
> and 5e41814a7d8b ("arm: get rid of execve wrapper, switch to generic
> execve() implementation") from the signal tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> BTW, Al, you have that vfs tree commit (and others) authored by you ...
Gyah... Will fix ASAP; sorry, guys.
next prev parent reply other threads:[~2012-09-28 11:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-28 5:56 linux-next: manual merge of the signal tree with the vfs tree Stephen Rothwell
2012-09-28 11:56 ` Al Viro [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-10-02 5:48 Stephen Rothwell
2012-10-12 3:56 Stephen Rothwell
2012-10-12 3:58 Stephen Rothwell
2012-10-12 4:00 Stephen Rothwell
2012-10-12 4:02 Stephen Rothwell
2012-10-12 4:06 Stephen Rothwell
2012-10-12 4:09 Stephen Rothwell
2013-04-04 5:41 Stephen Rothwell
2013-04-04 5:41 Stephen Rothwell
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=20120928115635.GE13973@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=akpm@linux-foundation.org \
--cc=alex.page.kelly@gmail.com \
--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