Messages in this thread |  | | Date | Mon, 5 Dec 2022 13:11:52 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the driver-core tree with the block tree |
| |
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 [unhandled content-type:application/pgp-signature] |  |