From: Philipp Stanner <pstanner@redhat•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Jens Axboe <axboe@kernel•dk>,
Bjorn Helgaas <bhelgaas@google•com>
Cc: 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 block tree with the pci tree
Date: Thu, 07 Nov 2024 09:13:00 +0100 [thread overview]
Message-ID: <71860affadbd3efe72edbced28b3135924a28594.camel@redhat.com> (raw)
In-Reply-To: <20241107162459.71e0288a@canb.auug.org.au>
On Thu, 2024-11-07 at 16:24 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> drivers/block/mtip32xx/mtip32xx.c
>
> between commit:
>
> 5080394a8fcb ("block: mtip32xx: Replace deprecated PCI functions")
>
> from the pci tree and commit:
>
> 91ff97a72259 ("mtip32xx: Replace deprecated PCI functions")
>
> from the block tree.
Ooops, that should not have happened – I must have lost overview over
my branches when submitting the latter.
I will improve quality ensurence.
>
> I fixed it up (I arbitraryly used the former version) and can carry
> the
> fix as necessary. This is now fixed as far as linux-next is
> concerned,
Thanks. I think dropping the latter is the right thing to do.
Regards,
Philipp
> 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.
>
next prev parent reply other threads:[~2024-11-07 8:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-07 5:24 linux-next: manual merge of the block tree with the pci tree Stephen Rothwell
2024-11-07 8:13 ` Philipp Stanner [this message]
2024-11-07 12:49 ` Jens Axboe
2024-11-07 13:11 ` Bjorn Helgaas
-- strict thread matches above, loose matches on Subject: below --
2018-10-16 0:33 Stephen Rothwell
2017-06-21 2:58 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=71860affadbd3efe72edbced28b3135924a28594.camel@redhat.com \
--to=pstanner@redhat$(echo .)com \
--cc=axboe@kernel$(echo .)dk \
--cc=bhelgaas@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox