From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Chris Zankel <chris@zankel.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the xtensa tree with Linus' tree
Date: Mon, 22 Oct 2012 10:40:56 +1100 [thread overview]
Message-ID: <20121022104056.d157f09f9c71052ecc1f64a5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 691 bytes --]
Hi Chris,
Today's linux-next merge of the xtensa tree got a conflict in
arch/xtensa/include/uapi/asm/unistd.h between commit 7216cabfff51
("xtensa: add missing system calls to the syscall table") from Linus'
tree and commit daff2ab722aa ("xtensa: add missing system calls to the
syscall table") from the xtensa tree.
These clearly were meant to be the same patch but the on in Linus' tree
has a later date, so I used it and can carry the fix as necessary (no
action is required).
Also, the top most commit in the xtensa tree has no signed-off-by line or
any real commit message. Please fix that up.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-10-21 23:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-21 23:40 Stephen Rothwell [this message]
2012-10-21 23:57 ` linux-next: manual merge of the xtensa tree with Linus' tree Chris Zankel
2012-12-14 0:06 Stephen Rothwell
2016-09-29 0:01 Stephen Rothwell
2017-12-19 0:32 Stephen Rothwell
2018-11-15 23:39 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=20121022104056.d157f09f9c71052ecc1f64a5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=chris@zankel.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).