From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bartlomiej Zolnierkiewicz <bzolnier@gmail•com>
Cc: linux-next@vger•kernel.org
Subject: linux-next: manual merge of the ide tree
Date: Wed, 9 Jul 2008 12:47:44 +1000 [thread overview]
Message-ID: <20080709124744.2468d3fb.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 533 bytes --]
Hi Bart,
Today's linux-next merge of the ide tree got a conflict in
drivers/ide/pci/it8213.c between commit
be305042b7a01a1ab03a8adfa95f57bc63e012e1 ("it8213: fix return value in
it8213_init_one()") from Linus' tree (which is also in the ide tree) and
commit 0524d020934e71bad3b9ea60e1c98ab7725c8aad ("ide: add ->dev and
->host_priv fields to struct ide_host") from the ide tree.
I just used the ide tree version.
--
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-09 2:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-09 2:47 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-08-06 3:35 linux-next: manual merge of the ide tree Stephen Rothwell
2008-07-23 4:06 Stephen Rothwell
2008-07-16 5:05 Stephen Rothwell
2008-07-17 3:40 ` Stephen Rothwell
2008-07-17 15:30 ` Bartlomiej Zolnierkiewicz
2008-07-18 0:42 ` Stephen Rothwell
2008-07-09 2:45 Stephen Rothwell
2008-07-07 10:49 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=20080709124744.2468d3fb.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bzolnier@gmail$(echo .)com \
--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