From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@elte.hu>
Subject: Re: linux-next: manual merge of the asm-generic tree with Linus' tree
Date: Fri, 12 Jun 2009 10:05:32 +0200 [thread overview]
Message-ID: <200906121005.33490.arnd@arndb.de> (raw)
In-Reply-To: <20090612164914.e03160af.sfr@canb.auug.org.au>
On Friday 12 June 2009, Stephen Rothwell wrote:
> Today's linux-next merge of the asm-generic tree got a conflict in
> include/asm-generic/atomic.h between commit
> 53e111a730ea8b002d57dd226098c12789993329 ("x86: Fix atomic_long_xchg() on
> 64bit") from Linus' tree and commit
> 72099ed2719fc5829bd79c6ca9d1783ed026eb37 ("asm-generic: rename atomic.h
> to atomic-long.h") from the asm-generic tree.
>
> I applied the fix from the former patch to atomic-long.h
Hi Stephen,
I pulled Linus' tree into the asm-generic tree now and fixed the two conflicts
in the same way you did. I thought about doing a rebase on his tree instead,
but wasn't sure what works better.
Arnd <><
next prev parent reply other threads:[~2009-06-12 8:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-12 6:49 linux-next: manual merge of the asm-generic tree with Linus' tree Stephen Rothwell
2009-06-12 8:05 ` Arnd Bergmann [this message]
2009-06-12 8:18 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-10-07 22:38 Stephen Rothwell
2021-10-08 8:29 ` Arnd Bergmann
2018-04-02 23:22 Stephen Rothwell
2016-11-09 22:38 Stephen Rothwell
2009-06-12 6:43 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=200906121005.33490.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=a.p.zijlstra@chello.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--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.