linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: czankel <chris@zankel.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Max Filippov <jcmvbkbc@gmail.com>
Subject: Re: linux-next: manual merge of the tip tree with the xtensa tree
Date: Sun, 12 Jan 2014 19:38:23 -0800	[thread overview]
Message-ID: <52D35FAF.5050805@zankel.net> (raw)
In-Reply-To: <20140113142642.6e1944155b1db50d2c70abb4@canb.auug.org.au>

Hi Stephen,

Thanks for the fix! I actually just got an updated set for most of the 
patches currently in the for_next tree for xtensa and might have to do a 
rebase to integrate them better. I'll include your fix when I come 
across the issue.

Thanks again,
-Chris

On 1/12/14 7:26 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/xtensa/include/asm/barrier.h between commit dbacef090841 ("xtensa:
> add SMP support") from the xtensa tree and commit 93ea02bb8435 ("arch:
> Clean up asm/barrier.h implementations using asm-generic/barrier.h") from
> the tip tree.
>
> I fixed it up (I am pretty sure - see below) and can carry the fix as
> necessary (no action is required).
>

  reply	other threads:[~2014-01-13  3:38 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-13  3:26 linux-next: manual merge of the tip tree with the xtensa tree Stephen Rothwell
2014-01-13  3:38 ` czankel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-11-11  3:31 Stephen Rothwell
2019-11-11 10:04 ` Borislav Petkov
2019-11-26 21:33 ` Stephen Rothwell
2014-01-13  3:26 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=52D35FAF.5050805@zankel.net \
    --to=chris@zankel.net \
    --cc=hpa@zytor.com \
    --cc=jcmvbkbc@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    /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).