Skip to contentSkip to conversation

Starting 6.12-cip branch

cip-dev Pavel Machek 1 participant 2 messages Mar 20, 2025 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Hi!

Quoted 5 lines

So... I'm starting 6.12-cip branch. It is based on 6.12.19 and I already pushed tree to kernel.org:

https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/log/?h=linux-6.12.y-cip

Quoted 8 lines

Next steps should be starting testing the branch. Chris, could you suggest appropriate gitlab-ci file? [Or even better, could we test the branch without the gitlab-ci file, as we are doing for stable trees?]

This error will need to be investigated:

fatal: Not a valid commit name
be20a73e03e19005cfa5c1c4d6158af1ba02f056

So we have this in our 6.1 tree:

commit 39a7d6ce0283d0f2b7b5bec585a56954509a6103

Author: Claudiu Beznea <[email protected]>
Date:   Fri Jan 24 10:59:57 2025 +0200

clk: renesas: vbattb: Add VBATTB clock driver

commit be20a73e03e19005cfa5c1c4d6158af1ba02f056 upstream.

But that upstream commit does not exist. I'll need to investigate more.

Most of patches ported okay, I'll push the results now and investigate the rest.

Quoted 5 lines

These commits will need to be ported from 6.1-rebase branch:

Collecting commits
Parsing commits
Checking commits not in v6.12

ok > 2 546875ccba938ba4f7b5c616a1a1e334c5f2903f a63fe5138f27d91f850abb52f6a0df37991b1e3e net: ravb: Add VLAN checksum support
ok > 3 85c171509821af048a45b435e0fac36edba6a0cb a993245cf3ad5d1164a71475eec17fd51e28201f net: ravb: Enable IPv6 TX checksum offload for GbEth
ok > 4 59cceae40c67d943687587912483d68226cd04de e7b69b28560bb977a05ab6ff280769b5a2ec1ee4 net: ravb: Enable IPv6 RX checksum offloading for GbEth ok > 5 e63b5fd02a00aab8e79691359e931dafcd9dfd05 e8486d788dab19ddc25358196c4859e3dda4456a net: ravb: Simplify UDP TX checksum offload
ok > 6 4574ba5b711d7f7968c116521ef58d46fd4f89b1 c28d544f32b95153155c94fb7411f2d6fa14bcd1 net: ravb: Disable IP header TX checksum offloading
ok > 7 faacdbba01802c89f7043f9a47ad442c1195d307 a7548baf2b4f58b75292cddd35830a230c77f9dd net: ravb: Simplify types in RX csum validation
ok > 8 5a2d973e36061cbf8d1ba00a9294244522715e53 15053ac983ab9fc781aeaa006c7c8b817b0bbb03 net: ravb: Combine if conditions in RX csum validation
ok > 9 8d2109c1a51525c3586c5bf6f78ab1ce3c2908f8 a1bdc025b634187d6d7cc462c5839ece8e102934 net: ravb: Drop IP protocol check from RX csum verification ok > 10 c4e347a02b14fa2425337473fcb120c62936cbc5 ac242a57ad28de613c61b76cb82b7d30a0e70e37 net: ravb: Disable IP header RX checksum offloading
ok > 11 8e3037924a36505531999df8f5847a68b9272c41 c3aef62f4dd2ce3fe35d45fdc5cfdebc02b22285 net: ravb: Factor out checksum offload enable bits
ok > 16 c520bbb523304ba98de9ffeeb0ef289921434125 aefdfb4c1c3ff4503caad2c357cab0fc4b910aea arm64: defconfig: Enable VBATTB clock and Renesas RTCA-3 ok > 17 0cd647cd53db0315361e41056e10739a5ee1e668 8d96cc36644ab5500f9b48f2f51d9473d77d29af arm64: dts: renesas: rzg3s-smarc-som: Enable RTC
ok > 18 2d768aee9f5294d2023e824c0906e2e7d1414629 8b8fef2d3115f20327438e7aae01cb80b0f87ff0 arm64: dts: renesas: r9a08g045: Add RTC node
ok > 19 ac948eb8ead1265ff034955bdbbb081744f1e7ed 011c639f99a749cbfc5256f91a5e6b0dc0c7835a arm64: dts: renesas: rzg3s-smarc-som: Enable VBATTB
ok > 20 23c44956bce5aa79c060fc3e5d51843735e6eda6 b3c797ba7dfe077b81bd521ef94574238f2982e1 arm64: dts: renesas: r9a08g045: Add VBATTB node
ok > 21 8f315a5c7376b2bc324d62a8400184da77f25e28 d0207ac40f9b01a737a657f19f66294acc70d8aa rtc: renesas-rtca3: Fix compilation error on RISC-V
ok > 22 d4488377609e36cd9785533c29ccea4b86c292b9 541924b0a8c2a69974ced3cc9d56d2f4fd056fac rtc: renesas-rtca3: Add driver for RTCA-3 available on Renesas RZ/G3S SoC ok > 23 71c61a45c951eca67dd2cbc4de9cdd687ece4ead e8e3acfa534f32c5d1afc1255ceca88577afa172 dt-bindings: rtc: renesas,rzg3s-rtc: Document the Renesas RTCA-3 IP ?? > 24 be20a73e03e19005cfa5c1c4d6158af1ba02f056 db7542114675a85d50f8b41b9cf342df7d0a7bf6 clk: renesas: vbattb: Add VBATTB clock driver
ok > 25 cdfd5daf90af8363fb1f58e08c829a775b2e2fc5 d7ae15b36472510c35f08d5c457e1525fff0d960 dt-bindings: clock: renesas,r9a08g045-vbattb: Document VBATTB ok > 27 e1ef630c56d36770e180f0d0bf7b61b5289f5c48 916eedaa995f67df0b205119649849ea5de83055 clk: Add devm_clk_hw_register_gate_parent_hw()
?? > 34 bad201b2ac4e238c6d4b6966a220240e3861640c 8222bfe0e3fe1ffc98a6d8a8e49284b3bb2c3dad watchdog: rzg2l_wdt: Power on the watchdog domain in the restart handler ok > 45 91dcdfbc5b770d4501b1a30d087affc9ed4fa6e5 f6e00b23d92b4cac35a5fcfa654fef1c4d999dd5 arm64: dts: renesas: rz{g2l,g2lc}-smarc-som: Update partition table for spi-nor flash ok > 47 c0f2ec5683160a8604292516de9bb6edc7073226 32f0604028a5cd99f6de6cc3f10dd1040b50c6dd arm64: dts: renesas: rzg2ul-smarc-som: Enable serial NOR flash ignore, 6.1 only: > 151 None 8315d48bdab555e103b02a0a76319cdb351e23c0 Revert "arm64: dts: renesas: rzg2l: Add missing cache-level properties"
??? > 517 None b99f83040dd996d328c7eed0d39c5bcc3ba7c23e Add configuration for gitlab-ci.

Quoted 6 lines

And these will need to be forward-ported from 6.1 branch:

Collecting commits
Parsing commits
Checking commits not in v6.12

ok > 1 651dee03696e1dfde6d9a7e8664bbdcd9a10ea7f d08cad4e6b100c19001d46f85ce913526ddd767f serial: sh-sci: Increment the runtime usage counter for the earlycon device ok > 2 5f1017069933489add0c08659673443c9905659e ea067d976d8b26f4c29c0d626b0ea371cd4ce19c serial: sh-sci: Clean sci_ports[0] after at earlycon exit ok > 3 239f11209e5f282e16f5241b99256e25dd0614b6 e526ac9a17969360c770da3f2ebae4b7cf2cfd86 serial: sh-sci: Move runtime PM enable to sci_probe_single() already? > 4 7cc0e0a43a91052477c2921f924a37d9c3891f0c c7e0eea97bbea76d715b9747ab93b22636a90e30 serial: sh-sci: Check if TX data was written to device in .tx_empty() ok > 5 c1117a2fefbcce30cced3a180585e0adebc0fa89 6947ffd86dafa874e841b5a25786d49ea22cf662 serial: sh-sci: Use plain struct copy in early_console_setup() ok > 8 d828c6726fe5642d1c71e9edbc4799c959b471cf c2bc4adb340a59dc45e2d328692ff49f609cc9b6 dt-bindings: serial: renesas: Document RZ/G3E (r9a09g047) scif

Quoted 3 lines

13 None 8da62141b20bae3e0cfb12c3537d530d14f02441 CIP: Bump version suffix to -cip38 after merge from stable 14 None f5afe3636e64ff166f857c71488e7de41c1f0e7c Merge tag 'v6.1.129'
into linux-6.1.y-cip

Best regards,
Pavel

Signature · 2 lines
DENX Software Engineering GmbH,        Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw

Hi!

Quoted 22 lines
Quoted 5 lines

So... I'm starting 6.12-cip branch. It is based on 6.12.19 and I already pushed tree to kernel.org:

https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/log/?h=linux-6.12.y-cip

Quoted 8 lines

Next steps should be starting testing the branch. Chris, could you suggest appropriate gitlab-ci file? [Or even better, could we test the branch without the gitlab-ci file, as we are doing for stable trees?]

This error will need to be investigated:

fatal: Not a valid commit name
be20a73e03e19005cfa5c1c4d6158af1ba02f056

So we have this in our 6.1 tree:

?? > 24 be20a73e03e19005cfa5c1c4d6158af1ba02f056 db7542114675a85d50f8b41b9cf342df7d0a7bf6 clk: renesas: vbattb: Add VBATTB clock driver

commit 39a7d6ce0283d0f2b7b5bec585a56954509a6103

Author: Claudiu Beznea <[email protected]>
Date:   Fri Jan 24 10:59:57 2025 +0200
Quoted 6 lines

clk: renesas: vbattb: Add VBATTB clock driver

commit be20a73e03e19005cfa5c1c4d6158af1ba02f056 upstream.

But that upstream commit does not exist. I'll need to investigate more.

This seems to be commit 3b42450ce1771c7b11d8f3563f4bbfe9b8d26611 upstream. I picked that one.

Quoted 1 line

?? > 34 bad201b2ac4e238c6d4b6966a220240e3861640c 8222bfe0e3fe1ffc98a6d8a8e49284b3bb2c3dad watchdog: rzg2l_wdt: Power on the watchdog domain in the restart handler

This one was picked up by Sasha in commit

commit 486fc631cc499a16bbf38c0b383df2bb83b7e18d

Author: Claudiu Beznea <[email protected]>
Date:   Tue Oct 15 19:47:32 2024 +0300

watchdog: rzg2l_wdt: Power on the watchdog domain in the restart handler

[ Upstream commit bad201b2ac4e238c6d4b6966a220240e3861640c ]

So no action required here.

Best regards,
Pavel

Signature · 2 lines
DENX Software Engineering GmbH,        Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany