From: Martin Kelly <mkelly@xevo.com>
To: Lars-Peter Clausen <lars@metafoo.de>,
"linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>
Cc: Jonathan Cameron <jic23@kernel.org>
Subject: Re: Patch process question
Date: Thu, 26 Apr 2018 10:00:06 -0700 [thread overview]
Message-ID: <83b1f705-c427-dc86-53d2-fbfcff14258a@xevo.com> (raw)
In-Reply-To: <0d12f947-30be-6289-776b-f9dd22e04766@metafoo.de>
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!
prev parent reply other threads:[~2018-04-26 17:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-25 17:49 Patch process question Martin Kelly
2018-04-25 18:09 ` Lars-Peter Clausen
2018-04-26 17:00 ` Martin Kelly [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83b1f705-c427-dc86-53d2-fbfcff14258a@xevo.com \
--to=mkelly@xevo.com \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox