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] [thread-next>] [day] [month] [year] [list]

Message-ID: <71860affadbd3efe72edbced28b3135924a28594.camel@redhat.com>
Date: Thu, 07 Nov 2024 09:13:00 +0100
From: Philipp Stanner <pstanner@...hat.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Jens Axboe <axboe@...nel.dk>, 
 Bjorn Helgaas <bhelgaas@...gle.com>
Cc: 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, 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.
>