From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jan Beulich <JBeulich@novell•com>,
Andrew Morton <akpm@linux-foundation•org>
Subject: linux-next: manual merge of the sparc-current tree with Linus' tree
Date: Sat, 26 Sep 2009 11:01:58 +1000 [thread overview]
Message-ID: <20090926110158.0fcd2763.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 550 bytes --]
Hi David,
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-09-26 1:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-26 1:01 Stephen Rothwell [this message]
2009-09-27 3:20 ` linux-next: manual merge of the sparc-current tree with Linus' tree David Miller
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=20090926110158.0fcd2763.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=JBeulich@novell$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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