From: "Krzysztof Wilczyński" <kwilczynski@kernel.org>
To: Niklas Cassel <cassel@kernel.org>
Cc: kernel test robot <lkp@intel.com>,
oe-kbuild-all@lists.linux.dev, linux-pci@vger.kernel.org
Subject: Re: [pci:controller/rockchip 11/11] drivers/pci/controller/dwc/pcie-dw-rockchip.c:491:undefined reference to `pci_epc_init_notify'
Date: Fri, 28 Jun 2024 09:27:52 +0900 [thread overview]
Message-ID: <20240628002752.GA2068526@rocinante> (raw)
In-Reply-To: <Zn0n_qvyd47Aw65E@ryzen.lan>
Hello,
> > Perhaps the smartest thing right now is to just recreate the
> > pci/controller/rockchip branch, by:
> > 1) reset the rockchip branch to v6.10-rc1
> > 2) merge the pci/controller/dwc branch to the rockchip branch
> > 3) merge the pci/endpoint branch to to the rockchip branch
> > 4) pick all the patches that are currently on the pci/controller/rockchip
> > 5) squash: 246afbe0f6fc ("PCI: dw-rockchip: Use pci_epc_init_notify() directly")
> > into the commit that adds dw-rockchip endpoint mode support
> > (9b2ba393b3a6 ("PCI: dw-rockchip: Add endpoint mode support"))
> > 6) squash: https://lore.kernel.org/linux-pci/20240626191325.4074794-2-cassel@kernel.org/
> > into the commit that adds dw-rockchip endpoint mode support
> > (9b2ba393b3a6 ("PCI: dw-rockchip: Add endpoint mode support"))
> >
> >
> > This way:
> > - All commits will build as individual patches, so no build errors from the
> > test robot (even when it builds a patch that is in the middle (e.g. 10/11)).
> > - Even if futher commits are applied to pci/controller/dwc or pci/endpoint,
> > we will not depend on any newly applied patches to these branches, so there
> > will be no need to "re-merge" the branches to the rockchip branch.
>
> The end result would look like this:
> https://github.com/floatious/linux/commits/dw-rockchip-remerge-example/
>
> (Just in case you want to git diff to see that we did the same thing...)
Thank you for this!
I did some work on the branch with an aim to fix the issues bot kindly
reported to us, a bit before I saw your message. Hopfully, I got things
right this time, and if not, then I will apply your steps/suggestion.
Krzysztof
prev parent reply other threads:[~2024-06-28 0:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-26 23:54 [pci:controller/rockchip 11/11] drivers/pci/controller/dwc/pcie-dw-rockchip.c:491:undefined reference to `pci_epc_init_notify' kernel test robot
2024-06-27 8:33 ` Niklas Cassel
2024-06-27 8:51 ` Niklas Cassel
2024-06-28 0:27 ` Krzysztof Wilczyński [this message]
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=20240628002752.GA2068526@rocinante \
--to=kwilczynski@kernel.org \
--cc=cassel@kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lkp@intel.com \
--cc=oe-kbuild-all@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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