From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Mackerras <paulus@samba•org>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
linuxppc-dev@ozlabs•org
Cc: linux-next@vger•kernel.org, Victor Gallardo <vgallardo@amcc•com>,
"David S. Miller" <davem@davemloft•net>,
Josh Boyer <jwboyer@linux•vnet.ibm.com>
Subject: linux-next: manual merge of the powerpc tree
Date: Tue, 14 Oct 2008 12:02:59 +1100 [thread overview]
Message-ID: <20081014120259.e902e407.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
Hi Paul, Ben,
Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/include/asm/dcr-regs.h between commit
6fbc779c03591ee536fef9efb7d7e20f281d0b5c ("ibm_newemac: Fix EMAC soft
reset on 460EX/GT") from Linus' tree and commit
fbcc4bacee30cad4e4a13d05492a9ed0c9c3e8c7 ("ibm_newemac: MAL support for
PowerPC 405EZ") from the powerpc tree.
Just overlapping additions. I fixed it up by taking both additions.
--
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 reply other threads:[~2008-10-14 2:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-14 1:02 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-14 1:02 linux-next: manual merge of the powerpc tree Stephen Rothwell
2008-07-14 5:44 Stephen Rothwell
2008-07-15 1:24 ` Steven Rostedt
2008-07-07 13:07 Stephen Rothwell
2008-07-07 21:13 ` Daniel Walker
2008-07-11 19:01 ` Bartlomiej Zolnierkiewicz
2008-07-12 3:41 ` Benjamin Herrenschmidt
2008-07-03 3:39 Stephen Rothwell
2008-07-03 5:47 ` Grant Likely
2008-07-03 12:22 ` Jon Smirl
2008-07-03 15:24 ` Grant Likely
2008-07-04 5:54 ` Grant Likely
2008-07-04 7:35 ` Jean Delvare
2008-07-01 6:48 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=20081014120259.e902e407.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=benh@kernel$(echo .)crashing.org \
--cc=davem@davemloft$(echo .)net \
--cc=jwboyer@linux$(echo .)vnet.ibm.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=paulus@samba$(echo .)org \
--cc=vgallardo@amcc$(echo .)com \
/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