linux-next: pci/driver-core merge conflicts

linux-next: pci/driver-core merge conflicts

[Stephen Rothwell]

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

Hi Jesse, Greg,

Today's linux-next merge of the pci tree got a trivial conflict in
drivers/base/power/main.c between commit
bd24b944eb93549b1ca5becbf27c7373504f7eed ("driver-core: prepare for
removal of 20 char limit from struct device") from the driver-core tree
and commit 4ba09608f82f2273b731560f702f8bbb167f4c23 ("Introduce new top
level suspend and hibernation callbacks") from the pci tree.  I took the
latter version except to use "dev_name(dev->parent)" instead of
"dev->parent->bus_id".

The second conflict was in include/linux/device.h between commit
9c77d9cc76e424a3c59822c405cbf75a45465170 ("class: move driver core
specific parts to a private structure") from the driver-core tree and
commit 4ba09608f82f2273b731560f702f8bbb167f4c23 ("Introduce new top level
suspend and hibernation callbacks") from the pci tree.  I just added both
new fields of struct class.

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

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

Re: linux-next: pci/driver-core merge conflicts

[Greg KH]

On Thu, May 29, 2008 at 12:18:47PM +1000, Stephen Rothwell wrote:
> Hi Jesse, Greg,
> 
> Today's linux-next merge of the pci tree got a trivial conflict in
> drivers/base/power/main.c between commit
> bd24b944eb93549b1ca5becbf27c7373504f7eed ("driver-core: prepare for
> removal of 20 char limit from struct device") from the driver-core tree
> and commit 4ba09608f82f2273b731560f702f8bbb167f4c23 ("Introduce new top
> level suspend and hibernation callbacks") from the pci tree.  I took the
> latter version except to use "dev_name(dev->parent)" instead of
> "dev->parent->bus_id".

Yes, that is correct.

> The second conflict was in include/linux/device.h between commit
> 9c77d9cc76e424a3c59822c405cbf75a45465170 ("class: move driver core
> specific parts to a private structure") from the driver-core tree and
> commit 4ba09608f82f2273b731560f702f8bbb167f4c23 ("Introduce new top level
> suspend and hibernation callbacks") from the pci tree.  I just added both
> new fields of struct class.

That should be fine.

thanks,

greg k-h

Re: linux-next: pci/driver-core merge conflicts

[Jesse Barnes]

On Wednesday, May 28, 2008 7:59 pm Greg KH wrote:
> On Thu, May 29, 2008 at 12:18:47PM +1000, Stephen Rothwell wrote:
> > Hi Jesse, Greg,
> >
> > Today's linux-next merge of the pci tree got a trivial conflict in
> > drivers/base/power/main.c between commit
> > bd24b944eb93549b1ca5becbf27c7373504f7eed ("driver-core: prepare for
> > removal of 20 char limit from struct device") from the driver-core tree
> > and commit 4ba09608f82f2273b731560f702f8bbb167f4c23 ("Introduce new top
> > level suspend and hibernation callbacks") from the pci tree.  I took the
> > latter version except to use "dev_name(dev->parent)" instead of
> > "dev->parent->bus_id".
>
> Yes, that is correct.
>
> > The second conflict was in include/linux/device.h between commit
> > 9c77d9cc76e424a3c59822c405cbf75a45465170 ("class: move driver core
> > specific parts to a private structure") from the driver-core tree and
> > commit 4ba09608f82f2273b731560f702f8bbb167f4c23 ("Introduce new top level
> > suspend and hibernation callbacks") from the pci tree.  I just added both
> > new fields of struct class.
>
> That should be fine.

Hm, I knew this would cause problems eventually. :)  Should I put these fixups 
in my tree?  Or can you track them somehow, Stephen?

Thanks,
Jesse

Re: linux-next: pci/driver-core merge conflicts

[Greg KH]

On Thu, May 29, 2008 at 08:57:16AM -0700, Jesse Barnes wrote:
> On Wednesday, May 28, 2008 7:59 pm Greg KH wrote:
> > On Thu, May 29, 2008 at 12:18:47PM +1000, Stephen Rothwell wrote:
> > > Hi Jesse, Greg,
> > >
> > > Today's linux-next merge of the pci tree got a trivial conflict in
> > > drivers/base/power/main.c between commit
> > > bd24b944eb93549b1ca5becbf27c7373504f7eed ("driver-core: prepare for
> > > removal of 20 char limit from struct device") from the driver-core tree
> > > and commit 4ba09608f82f2273b731560f702f8bbb167f4c23 ("Introduce new top
> > > level suspend and hibernation callbacks") from the pci tree.  I took the
> > > latter version except to use "dev_name(dev->parent)" instead of
> > > "dev->parent->bus_id".
> >
> > Yes, that is correct.
> >
> > > The second conflict was in include/linux/device.h between commit
> > > 9c77d9cc76e424a3c59822c405cbf75a45465170 ("class: move driver core
> > > specific parts to a private structure") from the driver-core tree and
> > > commit 4ba09608f82f2273b731560f702f8bbb167f4c23 ("Introduce new top level
> > > suspend and hibernation callbacks") from the pci tree.  I just added both
> > > new fields of struct class.
> >
> > That should be fine.
> 
> Hm, I knew this would cause problems eventually. :)  Should I put these fixups 
> in my tree?  Or can you track them somehow, Stephen?

Yes, I'll be breaking them up and sending them to you in a few days so
Stephen doesn't have to handle all of this.  Right now it's in a single
patch file that touches about 400+ files :)

thanks,

greg k-h

Re: linux-next: pci/driver-core merge conflicts

[Stephen Rothwell]

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

Hi Jesse,

On Thu, 29 May 2008 08:57:16 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Hm, I knew this would cause problems eventually. :)  Should I put these fixups 
> in my tree?  Or can you track them somehow, Stephen?

Tracking these in my tree is ok in the short term as "git rerere" tracks
them for me.

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

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

Re: linux-next: pci/driver-core merge conflicts

[Stephen Rothwell]

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

On Thu, 29 May 2008 09:02:21 -0700 Greg KH <greg@kroah.com> wrote:
>
> On Thu, May 29, 2008 at 08:57:16AM -0700, Jesse Barnes wrote:
> > 
> > Hm, I knew this would cause problems eventually. :)  Should I put these fixups 
> > in my tree?  Or can you track them somehow, Stephen?
> 
> Yes, I'll be breaking them up and sending them to you in a few days so
> Stephen doesn't have to handle all of this.  Right now it's in a single
> patch file that touches about 400+ files :)

Of course, it is even better when I don't have to track them at all :-)

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

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