linux-kernel - Re: linux-next: manual merge of the block tree with the pci 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-prev] [day] [month] [year] [list]

Message-ID: <20241107131121.GA1603326@bhelgaas>
Date: Thu, 7 Nov 2024 07:11:21 -0600
From: Bjorn Helgaas <helgaas@...nel.org>
To: Jens Axboe <axboe@...nel.dk>
Cc: Philipp Stanner <pstanner@...hat.com>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	Bjorn Helgaas <bhelgaas@...gle.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the pci tree

On Thu, Nov 07, 2024 at 05:49:18AM -0700, Jens Axboe wrote:
> 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?

Sure.  5080394a8fcb dropped from the PCI tree.