On 04/25/2018 11:09 AM, Lars-Peter Clausen wrote:
On 04/25/2018 07:49 PM, Martin Kelly wrote:
Hi,
I have a quick question regarding the patch submission process for IIO.
Let's say I have a patch that I know will hit conflicts against other
accepted patches that are in linux-iio testing and/or togreg but have
not yet landed in torvalds master.
Which of these things should I do?
- Make patch against torvalds master (then it will have merge conflicts
when accepted).
- Make patch against testing or togreg (whichever branch contains the
conflicts).
Either this...
- Wait to test/send the patch until the patches with conflicts make it
into torvalds master (this could be a while, and depending on which
patches get accepted, more conflicts may arise again in testing/togreg).
or this.
Thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
