From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
linux-next@vger.kernel.org, Kay Sievers <kay.sievers@vrfy.org>
Subject: Re: linux-next: manual merge of the ide tree with the driver-core tree
Date: Sun, 25 Jan 2009 19:18:21 -0800 [thread overview]
Message-ID: <20090126031821.GA1911@kroah.com> (raw)
In-Reply-To: <20090126125011.e060bd19.sfr@canb.auug.org.au>
On Mon, Jan 26, 2009 at 12:50:11PM +1100, Stephen Rothwell wrote:
> 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.
Bart, you have the patch that Kay sent, is it not needed anymore?
Stephen, thanks for putting up with this, it's hard to get rid of driver
core fields at times :(
thanks,
greg k-h
next prev parent reply other threads:[~2009-01-26 3:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-26 1:50 linux-next: manual merge of the ide tree with the driver-core tree Stephen Rothwell
2009-01-26 3:18 ` Greg KH [this message]
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=20090126031821.GA1911@kroah.com \
--to=greg@kroah.com \
--cc=bzolnier@gmail.com \
--cc=kay.sievers@vrfy.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).