From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Bjorn Helgaas" <bhelgaas@google•com>,
"Lorenzo Pieralisi" <lpieralisi@kernel•org>,
"Krzysztof Wilczyński" <kw@linux•com>
Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the pci tree with the pci-current tree
Date: Thu, 24 Oct 2024 11:25:16 +1100 [thread overview]
Message-ID: <20241024112516.18b226af@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 830 bytes --]
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")
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-10-24 0:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-24 0:25 Stephen Rothwell [this message]
2024-10-24 6:56 ` linux-next: manual merge of the pci tree with the pci-current tree Bartosz Golaszewski
2024-10-24 18:50 ` Bjorn Helgaas
-- strict thread matches above, loose matches on Subject: below --
2026-01-05 0:55 Stephen Rothwell
2024-06-03 0:24 Stephen Rothwell
2018-08-01 0:42 Stephen Rothwell
2016-02-24 0:02 Stephen Rothwell
2014-03-12 13:00 Mark Brown
2010-03-26 0:57 Stephen Rothwell
2010-03-26 2:10 ` Jesse Barnes
2010-03-26 2:48 ` Stephen Rothwell
2010-03-26 16:03 ` Jesse Barnes
2010-03-26 14:43 ` Bjorn Helgaas
2009-02-06 2:50 Stephen Rothwell
2009-02-06 17:09 ` Jesse Barnes
2009-02-06 23:49 ` Rafael J. Wysocki
2009-02-07 0:07 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241024112516.18b226af@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bartosz.golaszewski@linaro$(echo .)org \
--cc=bhelgaas@google$(echo .)com \
--cc=kw@linux$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lpieralisi@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox