On Sun, Aug 18, 2024 at 11:34 PM Kevin Hao <haoke...@gmail.com> wrote:
>
> On Sun, Aug 18, 2024 at 11:26:40PM -0400, Bruce Ashfield wrote:
> > In message: [PATCH linux-yocto] octeontx2-af: Remove unrelated changes
> > introduced when merging v5.15/standard/base
> > on 15/08/2024 Kevin Hao wrote:
> >
> > > From: Kevin Hao <kexin....@windriver.com>
> > >
> > > The merge commit 82bab3e1d163 ("Merge branch 'v5.15/standard/base' into
> > > v5.15/standard/preempt-rt/base") introduced a lot of unrelated changes.
> > > These affected files should have the same content in both the standard
> > > and rt kernels. The changes in this patch is almost the same as the
> > > output of the following command:
> > > rediff <(git show 82bab3e1d163
> > > drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | \
> > > sed -e "s#^++\([^-+]\+\|$\)#-\1#" -e "s#^--\([^-+]\+\|$\)#+\1#" -e
> > > "s#^ # #" \
> > > -e "s#^[-+] # #" -e "s#^ [-+]# #" -e "s#^diff --cc#diff --git#" -e
> > > "s#^@@@ [0-9,-]\+#@@#" \
> > > -e "s#@@@#@@#")
> > >
> > > Signed-off-by: Kevin Hao <kexin....@windriver.com>
> > > ---
> > > Hi Bruce,
> > >
> > > These unrelated changes were introduced by a merge commit on rt base
> > > branch,
> > > but we can't simply cherry-pick this patch on rt base branch, and then
> > > merge it into all the rt branches because some of rt branches don't
> > > need these changes. So we have to manually apply this patch to
> > > all the following rt branches:
> >
> > I have the same question as with the other fixup your sent
> > (for the bad merge commit 82bab3e1d163).
> >
> > These changes are on v5.15/standard/preempt-rt/base as well.
> >
> > They don't look valid on that branch to me, since I can't trace
> > them to a -stable or other commit on v5.15/standard/base
> >
> > There has been a long standing periodic issue where
> > v<version>/standard/preempt-rt/base is not always merged
> > to the BSP branches.
> >
> > My proposal is that I'd apply this to standard/preempt-rt/base
> > and then merge it to all the BSP branches. That should allow
> > it to apply everywhere, as both the issue and the fix will
> > be merged as one.
> >
> > I don't see how these would be valid on any branch, so doing
> > that merge should unify everything.
>
> These changes should not be applied to the following two octeon branches:
> v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
> v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
>
> So if you choose to merge this to the standard/preempt-rt/base first, and then
> merge it to all the BSP branches, please remember to do a separate
> revert of that merge commit on these two branches.
>
It isn't quite that simple.
There's a merge conflict with those branches due to the fixup
change being in preempt-rt/base, so I can't simply revert the
merge commit as it contains other changes.
I can always do a -Xours merge to the BSP branch to get most
everything correct, and you could send a fixup for those
two BSP branches.
Would that work ?
Bruce
>
> >
> > Bruce
> >
> > > v5.15/standard/preempt-rt/bcm-2xxx-rpi
> > > v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
> > > v5.15/standard/preempt-rt/nxp-sdk-5.10/nxp-s32g
> > > v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
> > > v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
> > > v5.15/standard/preempt-rt/sdkv5.10/axxia
> > > v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
> > > v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
> > > v5.15/standard/preempt-rt/x86
> > >
> > > By the way, a standard kernel branch also need this patch:
> > > v5.15/standard/nxp-sdk-5.15/nxp-soc
>
> Please also remember to apply this on this standard BSP branch.
>
> Thanks,
> Kevin
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14279):
https://lists.yoctoproject.org/g/linux-yocto/message/14279
Mute This Topic: https://lists.yoctoproject.org/mt/107912365/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
