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

Message-ID: <20241107162459.71e0288a@canb.auug.org.au>
Date: Thu, 7 Nov 2024 16:24:59 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: 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>, Philipp Stanner
 <pstanner@...hat.com>
Subject: linux-next: manual merge of the block tree with the pci tree

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.

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,
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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped