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

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

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

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-05  2:11 Stephen Rothwell
2022-12-05  8:03 ` Greg KH [this message]
  -- 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=Y42lxp8WyoVAL2QX@kroah.com \
    --to=greg@kroah.com \
    --cc=axboe@kernel.dk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --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).