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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:

  include/linux/blkdev.h
  drivers/block/pktcdvd.c

between commits:

  f40eb99897af ("pktcdvd: remove driver.")
  85d6ce58e493 ("block: remove devnode callback from struct block_device_operations")

from the block tree and commit:

  be7e8b917ead ("blkdev: make struct block_device_operations.devnode() take a const *")

from the driver-core tree.

I fixed it up (I removed pktcdvd.c and used blkdev.h from the former tree)
and can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Greg KH]

On Mon, Dec 05, 2022 at 01:11:52PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   include/linux/blkdev.h
>   drivers/block/pktcdvd.c
> 
> between commits:
> 
>   f40eb99897af ("pktcdvd: remove driver.")
>   85d6ce58e493 ("block: remove devnode callback from struct block_device_operations")
> 
> from the block tree and commit:
> 
>   be7e8b917ead ("blkdev: make struct block_device_operations.devnode() take a const *")
> 
> from the driver-core tree.
> 
> I fixed it up (I removed pktcdvd.c and used blkdev.h from the former tree)
> and can carry the fix as necessary. This is now fixed as far as linux-next
> is concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.

As it was me who wrote all of the above patches, I knew this would
conflict, sorry about that :)

And thanks for the resolution, using the block tree's versions is
correct.

greg k-h

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

[Stephen Rothwell]

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

Hi all,

On Mon, 29 Apr 2019 15:24:00 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   block/blk-sysfs.c
> 
> between commit:
> 
>   4d25339e32a1 ("block: don't show io_timeout if driver has no timeout handler")
> 
> from the block tree and commit:
> 
>   800f5aa1e7e1 ("block: Replace all ktype default_attrs with groups")
> 
> from the driver-core tree.
> 
> I fixed it up (the former stopped using the default_attrs field, so I
> effectively reverted the latter changes to this file) and can carry the
> fix as necessary. This is now fixed as far as linux-next is concerned,
> but any non trivial conflicts should be mentioned to your upstream
> maintainer when your tree is submitted for merging.  You may also want
> to consider cooperating with the maintainer of the conflicting tree to
> minimise any particularly complex conflicts.

This is now a conflict between the block tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:

  block/blk-sysfs.c

between commit:

  4d25339e32a1 ("block: don't show io_timeout if driver has no timeout handler")

from the block tree and commit:

  800f5aa1e7e1 ("block: Replace all ktype default_attrs with groups")

from the driver-core tree.

I fixed it up (the former stopped using the default_attrs field, so I
effectively reverted the latter changes to this file) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]