From: David Miller <davem@davemloft•net>
To: sfr@canb•auug.org.au
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
JBeulich@novell•com, akpm@linux-foundation•org
Subject: Re: linux-next: manual merge of the sparc-current tree with Linus' tree
Date: Sat, 26 Sep 2009 20:20:07 -0700 (PDT) [thread overview]
Message-ID: <20090926.202007.257820623.davem@davemloft.net> (raw)
In-Reply-To: <20090926110158.0fcd2763.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Sat, 26 Sep 2009 11:01:58 +1000
> Today's linux-next merge of the sparc-current tree got a conflict in
> arch/sparc/include/asm/vio.h between commit
> 8c87df457cb58fe75b9b893007917cf8095660a0 ("BUILD_BUG_ON(): fix it and a
> couple of bogus uses of it") from Linus' tree and commit
> 87ba00515657eede6077fa195ca6592b98cc31e3 ("sparc64: vio: Kill BUILD_BUG_ON
> () in vio_dring_avail()") from the sparc-current tree.
>
> I just used the sparc-current version for today.
Thanks Stephen. When Linus pulled in my tree he resolved the
merge conflict and thus you shouldn't have to deal with this
any more either.
prev parent reply other threads:[~2009-09-27 3:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-26 1:01 linux-next: manual merge of the sparc-current tree with Linus' tree Stephen Rothwell
2009-09-27 3:20 ` David Miller [this message]
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=20090926.202007.257820623.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=JBeulich@novell$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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