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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20221205131152.26c49399@canb.auug.org.au>
Date:   Mon, 5 Dec 2022 13:11:52 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Jens Axboe <axboe@...nel.dk>
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
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

Content of type "application/pgp-signature" skipped