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,
Michael Cree <mcree@orcon.net.nz>,
Matt Turner <mattst88@gmail.com>
Subject: linux-next: manual merge of the signal tree with Linus' tree
Date: Tue, 21 Aug 2012 14:57:42 +1000 [thread overview]
Message-ID: <20120821145742.8f4640e49ef079d83dfe0ba4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/alpha/kernel/process.c between commit 28d353d9891c ("alpha: take
kernel_execve() out of entry.S") from Linus' tree and commit 68f596a7a045
("alpha: rewrite kernel_execve in C") from the signal tree.
These appear to be the same patch with a slight difference in this file.
I just used the version from Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-08-21 4:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-21 4:57 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-03-28 4:28 linux-next: manual merge of the signal tree with Linus' tree Stephen Rothwell
2013-03-12 3:25 Stephen Rothwell
2013-03-04 2:03 Stephen Rothwell
2013-03-04 10:16 ` James Hogan
2013-03-04 1:58 Stephen Rothwell
2012-12-21 2:42 Stephen Rothwell
2012-12-21 2:42 Stephen Rothwell
2012-12-21 2:33 Stephen Rothwell
2012-07-02 6:12 Stephen Rothwell
2012-05-24 5:54 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=20120821145742.8f4640e49ef079d83dfe0ba4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mattst88@gmail.com \
--cc=mcree@orcon.net.nz \
--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).