On 22/07/2025 at 19:52, Marc Kleine-Budde a écrit :

On 22.07.2025 12:48:41, Marc Kleine-Budde wrote:

quoted

On 20.07.2025 17:28:23, Randy Dunlap wrote:

quoted

Add a dependency on PC104 to limit (restrict) this driver kconfig
prompt to kernel configs that have PC104 set.

Add COMPILE_TEST as a possibility for more complete build coverage.
I tested this build config on x86_64 5 times without problems.

I've already Vincent's patch [1] on my tree.

[1] https://lore.kernel.org/all/20250715-can-compile-test-v2-3-f7fd566db86f@wanadoo.fr/ (local)

Don't know how I did not realize the conflict when reviewing :D

quoted

So this doesn't apply any more. Fixing the merge conflicts result in:

index ba16d7bc09ef..e061e35769bf 100644

--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig

@@ -105,7 +105,7 @@ config CAN_SJA1000_PLATFORM
 
 config CAN_TSCAN1
         tristate "TS-CAN1 PC104 boards"
-        depends on ISA || (COMPILE_TEST && HAS_IOPORT)
+        depends on (ISA && PC104) || (COMPILE_TEST && HAS_IOPORT)
         help
           This driver is for Technologic Systems' TSCAN-1 PC104 boards.
           https://www.embeddedts.com/products/TS-CAN1

Should be ok?

If no-one complains I'll add this to my can-next tree and remove the
Fixes tag. Otherwise stable will pick this up, but it won't apply
without Vincent's patch.

I do not really mind if those are not backported. No issue for me to drop the
fix tag.

Yours sincerely,
Vincent Mailhol