linux-kernel - Re: linux-next: manual merge of the pci tree with Linus' 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: <CAMRc=MdS7QV0G=zFUJ3fMitQDwmEGM1xH7jCMydicpBaEraVCA@mail.gmail.com>
Date: Thu, 27 Nov 2025 09:25:08 +0100
From: Bartosz Golaszewski <brgl@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Bjorn Helgaas <bhelgaas@...gle.com>, Lorenzo Pieralisi <lpieralisi@...nel.org>, 
	Krzysztof Wilczyński <kwilczynski@...nel.org>, 
	Bartosz Golaszewski <bartosz.golaszewski@...aro.org>, 
	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 pci tree with Linus' tree

On Thu, Nov 27, 2025 at 12:46 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
>   MAINTAINERS
>
> between commit:
>
>   2b6d546ba83e ("MAINTAINERS: update my email address")
>
> from Linus' tree and commit:
>
>   010515bd2d47 ("MAINTAINERS: Add Manivannan Sadhasivam as PCI/pwrctl maintainer")
>
> from the pci tree.
>
> I fixed it up (see below) 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
>
> diff --cc MAINTAINERS
> index 2fcbda2fdca1,c61750164ba9..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -19955,7 -19886,8 +19971,8 @@@ F:   drivers/pci/p2pdma.
>   F:    include/linux/pci-p2pdma.h
>
>   PCI POWER CONTROL
>  -M:    Bartosz Golaszewski <brgl@...ev.pl>
>  +M:    Bartosz Golaszewski <brgl@...nel.org>
> + M:    Manivannan Sadhasivam <mani@...nel.org>
>   L:    linux-pci@...r.kernel.org
>   S:    Maintained
>   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git

Looks good, thanks!

Bart