From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bartlomiej Zolnierkiewicz <bzolnier@gmail•com>
Cc: linux-next@vger•kernel.org, Kay Sievers <kay.sievers@vrfy•org>,
Greg KH <greg@kroah•com>
Subject: linux-next: manual merge of the ide tree with the driver-core tree
Date: Mon, 26 Jan 2009 12:50:11 +1100 [thread overview]
Message-ID: <20090126125011.e060bd19.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
Hi Bartlomiej,
Today's linux-next merge of the ide tree got a conflict in
drivers/ide/ide-acpi.c between commit
ea23519ff92f553facc0a73fe4daab852c75a306 ("ide: struct device - replace
bus_id with dev_name(), dev_set_name()") from the driver-core tree and
commit d721aa90f7ba2059b007a9c13c9fb09db99ce467 ("ide-acpi: cleanup
do_drive_get_GTF()") from the ide tree.
The latter removed code that the former modified. I used the latter
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:[~2009-01-26 1:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-26 1:50 Stephen Rothwell [this message]
2009-01-26 3:18 ` linux-next: manual merge of the ide tree with the driver-core tree Greg KH
2009-01-26 3:46 ` Stephen Rothwell
2009-01-27 14:43 ` Bartlomiej Zolnierkiewicz
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=20090126125011.e060bd19.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bzolnier@gmail$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=kay.sievers@vrfy$(echo .)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