In message: Trial merge of v5.15.118 v6.1.35 for linux-yocto on 22/06/2023 Kevin Hao wrote:
> Hi Bruce, > > This is a trial merge of the stable kernel v5.15.118 v6.1.35 for the > following branches in the linux-yocto. > 44291613df39 v5.15/standard/sdkv5.10/axxia > 92d333324e0c v5.15/standard/preempt-rt/sdkv5.10/axxia > eee9186b951b v5.15/standard/base > 0a56534ef10f v5.15/standard/preempt-rt/base > ad8238bf23e4 v5.15/standard/cn-sdkv5.4/octeon > ae0e45d47b8c v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > c9f7bcffad9b v5.15/standard/cn-sdkv5.15/octeon > fa68d715b4c0 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > f2a817ae09ba v5.15/standard/ti-sdk-5.10/ti-j72xx > 6c3c7f6a6ff8 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > 5c70c1828bc8 v5.15/standard/nxp-sdk-5.15/nxp-soc > 7870ff843da9 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > 93fc903bf3b2 v5.15/standard/bcm-2xxx-rpi > 67cc6b5860a8 v5.15/standard/preempt-rt/bcm-2xxx-rpi > 4946059cd722 v5.15/standard/nxp-sdk-5.15/nxp-s32g > 443c74d30bdc v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > f5aaf57cfc36 v5.15/standard/intel-sdk-5.15/intel-socfpga > 25f2d619ab9d v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > 50c176083e31 v5.15/standard/x86 > 37658a804e93 v5.15/standard/preempt-rt/x86 > 869872f0c312 v5.15/standard/sdkv5.15/xlnx-soc > ed56ec271aad v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > 1a6bfea9a36b v6.1/standard/base > e6509db19fb3 v6.1/standard/preempt-rt/base > 51c7b330dd8c v6.1/standard/ti-sdk-6.1/ti-j7xxx > f8c93e3014c3 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > 777cd1c5e959 v6.1/standard/nxp-sdk-6.1/nxp-soc > 5c671cc77d3a v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > 49df57c938fb v6.1/standard/cn-sdkv5.15/octeon > 031d124bf078 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > a82523a38e3f v6.1/standard/bcm-2xxx-rpi > cb5c94d4111c v6.1/standard/preempt-rt/bcm-2xxx-rpi > 0b093c0248d5 v6.1/standard/nxp-sdk-5.15/nxp-s32g > 10d3002fa67d v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > 947d06fe506e v6.1/standard/intel-sdk-6.1/intel-socfpga > 8c6b64e15d46 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > 62d290096206 v6.1/standard/x86 > 5cd07f81418f v6.1/standard/preempt-rt/x86 > fee4d840f3e9 v6.1/standard/sdkv6.1/xlnx-soc > #Have textual conflicts > 5eeba80c3635 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > #Have textual conflicts > > This seems a very clean stable release and there is only one trivial merge > conflict > in the xlnx-soc branches on v6.1 kernel. All the branches have passed my > build test. > I have pushed all these branches to: > https://github.com/haokexin/linux > Thanks Kevin. I had the same results here, the updates are now pushed. Bruce > 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 (#12786): https://lists.yoctoproject.org/g/linux-yocto/message/12786 Mute This Topic: https://lists.yoctoproject.org/mt/99689438/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
