linux-next: manual merge of the ide tree with the driver-core tree

linux-next: manual merge of the ide tree with the driver-core tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: manual merge of the ide tree with the driver-core tree

[Greg KH]

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

Re: linux-next: manual merge of the ide tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

Hi Greg,

On Sun, 25 Jan 2009 19:18:21 -0800 Greg KH <greg@kroah.com> wrote:
>
> Stephen, thanks for putting up with this, it's hard to get rid of driver
> core fields at times :(

I have noticed :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ide tree with the driver-core tree

[Bartlomiej Zolnierkiewicz]

On Monday 26 January 2009, Greg KH wrote:
> 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?

Yeah, I just got it (if you meant fixup for IDE ACPI debug code, cause the
original patch is already in Linus' tree).  You can drop it from your tree.

Thanks,
Bart