Upstreaming - how to deal with vendor fork

[Patryk]

Hi
Some time ago I managed to upstream one bugfix, now I have more changes but
I'm wondering how to approach this.

Suppose that I have found a bug and prepared a fix. However, the bug and
its solution has been found and tested on a custom board that is equipped
with a particular buggy device. The problem is that I cannot simply use
mainline/maintainer tree, build it, and run on my board as these source
trees do not have support for my board, as I use SoC vendor fork (v6.12)
supplied with their bsp with patches that add support for my board.

It's not mine decision - obviously - me and my team would be very willing
to use mainline but it would require some effort, time and obviously we
would not get vendor support in case of some bugs (it happened mamy times).

I can of course take the minimal set of patches for out board and apply
them over mainline but e.g. now I have a bugfix for mainline driver...but
in order to fully test it I need vendor changes as they did not upstream it
yet.

So at the end in order to test a bugfix on the mainline I would need to
apply patches that add support for my board as well patches from vendor
fork that add support for the rest of the functionality (not yet upstreamed
by vendor) that I need in order to test the bugfix.

Any sugestion on how to approach this? I have already few changes that
could be applied to mainline but due to what I described above they're just
waiting...

Will be grateful for some sugestion.

Best regards
Patryk
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20260429/eae31291/attachment.html>