From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>
Cc: linux-next@vger•kernel.org,
Bartlomiej Zolnierkiewicz <bzolnier@gmail•com>,
Sam Ravnborg <sam@ravnborg•org>
Subject: linux-next: manual merge of the sparc tree
Date: Wed, 16 Jul 2008 17:19:46 +1000 [thread overview]
Message-ID: <20080716171946.f26f9f2e.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 539 bytes --]
Hi Dave,
Today's linux-next merge of the sparc tree got a conflict in
include/asm-sparc/ide.h between commit
28f42f1b76ba97dbc68041c75be387b743dcf5b1 ("ide: define MAX_HWIFS in
<linux/ide.h>") from the ide tree and commit
0d4b5053275562b4ff7a9a98942936c9eb9b5c18 ("sparc: join the remaining
header files") from the sparc tree.
I applied the change from the ide commit to asm-sparc/ide_32.h (just
remove three lines).
--
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-07-16 7:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-16 7:19 Stephen Rothwell [this message]
2008-07-16 7:23 ` linux-next: manual merge of the sparc tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-07-16 7:31 Stephen Rothwell
2008-07-16 7:39 Stephen Rothwell
2008-07-18 6:07 ` David Miller
2008-09-04 1:17 Stephen Rothwell
2008-09-04 1:17 ` David Miller
2008-09-04 4:14 ` Stephen Rothwell
2008-09-16 20:27 Stephen Rothwell
2008-09-16 21:31 ` David Miller
2008-09-16 21:40 ` 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=20080716171946.f26f9f2e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bzolnier@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sam@ravnborg$(echo .)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