All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chris Zankel <chris@zankel.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the xtensa tree with Linus' tree
Date: Sun, 21 Oct 2012 16:57:00 -0700	[thread overview]
Message-ID: <50848BCC.9030208@zankel.net> (raw)
In-Reply-To: <20121022104056.d157f09f9c71052ecc1f64a5@canb.auug.org.au>

Hi Stephen,

Sorry, I accidentally pushed this patch up; should be fixed the next 
next time you pull.

Thanks,
-Chris



On 10/21/2012 04:40 PM, Stephen Rothwell wrote:
> 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.
>

  reply	other threads:[~2012-10-21 23:57 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-21 23:40 linux-next: manual merge of the xtensa tree with Linus' tree Stephen Rothwell
2012-10-21 23:57 ` Chris Zankel [this message]
  -- strict thread matches above, loose matches on Subject: below --
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=50848BCC.9030208@zankel.net \
    --to=chris@zankel.net \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.