linux-kernel - Re: linux-next: manual merge of the pci tree with the pci-current 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20241024185007.GA968089@bhelgaas>
Date: Thu, 24 Oct 2024 13:50:07 -0500
From: Bjorn Helgaas <helgaas@...nel.org>
To: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
	Bjorn Helgaas <bhelgaas@...gle.com>,
	Lorenzo Pieralisi <lpieralisi@...nel.org>,
	Krzysztof Wilczyński <kw@...ux.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 pci tree with the pci-current
 tree

On Thu, Oct 24, 2024 at 08:56:11AM +0200, Bartosz Golaszewski wrote:
> On Thu, 24 Oct 2024 at 02:25, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the pci tree got a conflict in:
> >
> >   drivers/pci/pwrctl/pci-pwrctl-pwrseq.c
> >
> > between commit:
> >
> >   ad783b9f8e78 ("PCI/pwrctl: Abandon QCom WCN probe on pre-pwrseq device-trees")
> >
> > from the pci-current tree and commit:
> >
> >   98cb476c98e9 ("PCI/pwrctl: Use generic device_get_match_data() instead of OF version")
> >
> 
> This can be dropped from pci-current given that the former will get
> upstream into v6.12.

I dropped 98cb476c98e9 from pci/next, thanks!

> > from the pci tree.
> >
> > I fixed it up (the former commit includes the changes from the latter)
> > 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