In message: Trial merge of v5.15.170 v6.1.115 v6.6.59 for linux-yocto on 03/11/2024 Kevin Hao wrote:
> Hi Bruce, > > This is a trial merge of the stable kernel v5.15.170 v6.1.115 v6.6.59 for the > following branches in the linux-yocto. > a6370afb45f3 v5.15/standard/sdkv5.10/axxia > e75e3268ebc3 v5.15/standard/preempt-rt/sdkv5.10/axxia > 42bf30782fd4 v5.15/standard/base > 90063a1722fd v5.15/standard/preempt-rt/base > a174ec68996e v5.15/standard/cn-sdkv5.4/octeon > #Have textual conflicts > 9e4cae608450 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > #Have textual conflicts > a4a51fad966e v5.15/standard/cn-sdkv5.15/octeon > #Have textual conflicts > 256857db10b0 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > #Have textual conflicts > ca67afe01228 v5.15/standard/ti-sdk-5.10/ti-j72xx > 07b5631d3733 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > 492f2e552a15 v5.15/standard/nxp-sdk-5.15/nxp-soc > #Have semantic conflicts > c7f6b2cb2653 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > #Have semantic conflicts > 67ae05beb307 v5.15/standard/bcm-2xxx-rpi > cdac1a1402f9 v5.15/standard/preempt-rt/bcm-2xxx-rpi > 2f4e628b75dd v5.15/standard/nxp-sdk-5.15/nxp-s32g > 4fe194052b8f v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > a506ffb82174 v5.15/standard/intel-sdk-5.15/intel-socfpga > a07a0304948d v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > e7318a1554f7 v5.15/standard/x86 > b7eeb28a5995 v5.15/standard/preempt-rt/x86 > 4fe2ef30bd71 v5.15/standard/sdkv5.15/xlnx-soc > #Have textual conflicts > 2c63a77b5633 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > #Have textual conflicts > 8f78a03f6bea v6.1/standard/sdkv5.10/axxia > e49fe0d23abf v6.1/standard/preempt-rt/sdkv5.10/axxia > c0434c60db25 v6.1/standard/base > d2772388dff8 v6.1/standard/preempt-rt/base > 7c80e6ff8ee4 v6.1/standard/ti-sdk-6.1/ti-j7xxx > ab45e76498dc v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > 8afe6d62f17e v6.1/standard/nxp-sdk-6.1/nxp-soc > #Have semantic conflicts > 929fd05badce v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > #Have semantic conflicts > ad1ee9c7f945 v6.1/standard/cn-sdkv5.15/octeon > #Have textual conflicts > 38b43319d8c7 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > #Have textual conflicts > 0b4409d779fe v6.1/standard/cn-sdkv6.1/octeon > #Have textual conflicts > 6b5441a5ee8f v6.1/standard/preempt-rt/cn-sdkv6.1/octeon > #Have textual conflicts > 8d39de23b153 v6.1/standard/microchip-polarfire-soc > 61016791ad1f v6.1/standard/preempt-rt/microchip-polarfire-soc > 4a483ab344e6 v6.1/standard/bcm-2xxx-rpi > d765b070df18 v6.1/standard/preempt-rt/bcm-2xxx-rpi > 0a83d57a3536 v6.1/standard/nxp-sdk-5.15/nxp-s32g > 6f9ea0317379 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > c73da8157a80 v6.1/standard/intel-sdk-6.1/intel-socfpga > 3d49cea2398d v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > da3d4cecf104 v6.1/standard/x86 > c03da8055741 v6.1/standard/preempt-rt/x86 > 8717af6ee888 v6.1/standard/sdkv6.1/xlnx-soc > #Have textual conflicts > 180028cd227a v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > #Have textual conflicts > f9d66da22d5d v6.6/standard/sdkv5.15/axxia > e3c6f89bc5e0 v6.6/standard/preempt-rt/sdkv5.15/axxia > 89457a511d07 v6.6/standard/base > bb7ff6cd3983 v6.6/standard/preempt-rt/base > 29071052d146 v6.6/standard/nxp-sdk-6.6/nxp-soc > #Have textual and semantic conflicts > ba34a5b3845c v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc > #Have textual and semantic conflicts > 77d57076c0ca v6.6/standard/cn-sdkv6.1/octeon > #Have textual conflicts > 162cb4601558 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon > #Have textual conflicts > 2cdfb5d2d30d v6.6/standard/microchip-polarfire-soc > 7035291bfc22 v6.6/standard/preempt-rt/microchip-polarfire-soc > e3deb059005b v6.6/standard/bcm-2xxx-rpi > 990de75a3765 v6.6/standard/preempt-rt/bcm-2xxx-rpi > 38ea75a8faa8 v6.6/standard/nxp-sdk-6.6/nxp-s32g > edbe73a1df06 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g > d071ed029c4f v6.6/standard/intel-sdk-6.6/intel-socfpga > 89d4186f6816 v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga > a4e633f40cc2 v6.6/standard/ti-sdk-6.6/ti-soc > eba1a7526b45 v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc > 361a85c41023 v6.6/standard/sdkv6.6/xlnx-soc > #Have textual conflicts > 68f2f0062884 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc > #Have textual conflicts > > - For all the Marvell branches (v5.15, v6.1 and v6.6), due to the moving of > resctrl from > arch/x86/kernel/cpu to fs/, we have to apply the changes of resctrl from > the stable > kernel update to the file under the fs/resctrl directory. > > - Due to the API change of function genlmsg_multicast_allns() in stable > kernel, there is > a semantic conflict for all the nxp-soc branches(v5.15, v6.1 and v6.6), we > also have to > adjust the parameters of genlmsg_multicast_allns() in the > net/tsn/genl_tsn.c. > > - On the v6.6 ti-soc branches, a SDK commit 71fc320ac1d0 revert a mainline > commit in > order to workaround a suspend issue on AM62 platforms, but this issue has > been fixed > in the latest stable kernel by commit 4fad73700867 and the SDK workaround > also break > the build of latest stable kernel. So I added a patch to revert that > workaround fix > after merging the latest stable kernel. Thanks for the detailed explanation. I was able to manually fixup the merge in a few places based on your information. If a branch didn't show an conflict, I didn't check for any fixups. So if I managed to miss something, send follow up patches and I'll get things fixed up. Bruce > > All the branches have passed my build test. I have pushed all these branches > to: > https://github.com/haokexin/linux > > You can use this as a reference for the linux-yocto stable kernel bump. > > Thanks, > Kevin
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14542): https://lists.yoctoproject.org/g/linux-yocto/message/14542 Mute This Topic: https://lists.yoctoproject.org/mt/109364724/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
