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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
