From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnd Bergmann <arnd@arndb•de>
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 18:18:02 +1000 [thread overview]
Message-ID: <20090612181802.b7bf4fd6.sfr@canb.auug.org.au> (raw)
In-Reply-To: <200906121005.33490.arnd@arndb.de>
[-- Attachment #1: Type: text/plain, Size: 994 bytes --]
Hi Arnd,
On Fri, 12 Jun 2009 10:05:32 +0200 Arnd Bergmann <arnd@arndb•de> wrote:
>
> 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
>
> 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.
I think what works better is what you are most comfortable with. Your
way works fine for me. Thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2009-06-12 8:18 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
2009-06-12 8:18 ` Stephen Rothwell [this message]
-- 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=20090612181802.b7bf4fd6.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=a.p.zijlstra@chello$(echo .)nl \
--cc=arnd@arndb$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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