LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Jens Axboe <axboe@kernel.dk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the driver-core tree with the block tree
Date: Mon, 5 Dec 2022 13:11:52 +1100	[thread overview]
Message-ID: <20221205131152.26c49399@canb.auug.org.au> (raw)

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

             reply	other threads:[~2022-12-05  2:12 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-05  2:11 Stephen Rothwell [this message]
2022-12-05  8:03 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2019-04-29  5:24 Stephen Rothwell
2019-05-08  2:25 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221205131152.26c49399@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=axboe@kernel.dk \
    --cc=greg@kroah.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --subject='Re: linux-next: manual merge of the driver-core tree with the block tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).