Re: linux-next: manual merge of the pci tree with Linus' tree

[Bartosz Golaszewski]

On Thu, Nov 27, 2025 at 12:46 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxx>
>  +M:    Bartosz Golaszewski <brgl@xxxxxxxxxx>
> + M:    Manivannan Sadhasivam <mani@xxxxxxxxxx>
>   L:    linux-pci@xxxxxxxxxxxxxxx
>   S:    Maintained
>   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git

Looks good, thanks!

Bart