From: Jens Axboe <axboe@kernel.dk>
To: Philipp Stanner <pstanner@redhat.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
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, 7 Nov 2024 05:49:18 -0700 [thread overview]
Message-ID: <fa092ae5-d15d-4f53-9de5-d06ebd985b33@kernel.dk> (raw)
In-Reply-To: <71860affadbd3efe72edbced28b3135924a28594.camel@redhat.com>
On 11/7/24 1:13 AM, Philipp Stanner wrote:
> 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.
Ehm that's not good. I can't drop it from the block tree, I have
merges sitting on top of it. Can it be dropped from the PCI tree?
--
Jens Axboe
next prev parent reply other threads:[~2024-11-07 12:49 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
2024-11-07 12:49 ` Jens Axboe [this message]
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=fa092ae5-d15d-4f53-9de5-d06ebd985b33@kernel.dk \
--to=axboe@kernel.dk \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pstanner@redhat.com \
--cc=sfr@canb.auug.org.au \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.