From: Takashi Iwai <tiwai@suse.de>
To: Lee Jones <lee.jones@linaro.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy@infradead.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Johannes Stezenbach <js@sig21.net>,
Hans de Goede <hdegoede@redhat.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
platform-driver-x86@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v5 1/3] mfd: Add support for Cherry Trail Dollar Cove TI PMIC
Date: Wed, 06 Sep 2017 17:02:41 +0200 [thread overview]
Message-ID: <s5htw0fkgz2.wl-tiwai@suse.de> (raw)
In-Reply-To: <20170906145432.szhmst6lhnuau6nz@dell>
On Wed, 06 Sep 2017 16:54:32 +0200,
Lee Jones wrote:
>
> > > > Right, and that's really fundamental, because then the user can tell you
> > > > "look, this commit doesn't work for me" instead of just "this kernel
> > > > doesn't work for me" and now you need to spend *your* time on trying to
> > > > figure out which commit may be at fault.
> > > >
> > > > So speaking of benefits, I really prefer to avoid spending my time on
> > > > such things. :-)
> > >
> > > The toss-up is between splitting the patch-set up and *maybe* spending
> > > time on debugging in the small chance of this occurring OR
> > > *definitely* spending time creating immutable branches and sending out
> > > pull-requests in the *hope* that all the other Maintainers involved
> > > are diligent enough to merge it in order to avoid conflicts during
> > > merge time.
> > >
> > > In the circles I spend time in ("we"), the former is the favourite.
> >
> > This certainly depends on the complexity. For a small patchset,
> > merging in a shot is often a safer option. That is, when all parties
> > agree, you can just apply all patches to your branch -- that's all.
> > Other parties can simply pull this from your branch if needed. Of
> > course, the branch needs to be immutable for that, but usually it's no
> > big problem. (Ideally speaking, all the published branches should be
> > persistent in anyway.)
> >
> > IIUC, it's the way Andy and Rafael suggested in the thread, and also
> > seen in many other subsystems occasionally.
> >
> > > Until this point (and from this point going forward) we have taken the
> > > decision that the default is to take individual patches through their
> > > own trees. The only time this differs (unless other arrangements are
> > > made e.g. PATCH 3/3) is when there are; build, merge or API
> > > dependencies between them. The same stance is taken with
> > > driver/platform data and driver/other driver.
> > >
> > > Let me put one of the issues into context:
> > >
> > > For those reading along that do not know, Multi-Functional Devices are
> > > usually single pieces of silicon which provide many functions
> > > (e.g. LED Controllers, Voltage Regulation, Power Management, Sensors,
> > > Timers, GPIO/Pinctrl Controllers, Watchdog Timers, Real-Time Clocks,
> > > etc etc). The driver which sits in drivers/mfd acts as the parent
> > > device and registers its children which live in their own subsystems.
> > >
> > > Almost all of the patch-sets I receive touch multiple subsystems.
> > > Moreover, when the recently described dependencies occur, it is
> > > usually I who creates the immutable branches and sends out the
> > > pull-requests.
> > >
> > > If I had to go through the immutable branch/pull-request process for
> > > every patch-set I receive, there would be very little time to conduct
> > > duties pertaining to my proper job. Ergo, why we apply our own
> > > patches, unless there is a good reason (already described) to apply
> > > others too.
> >
> > Hm, I never thought that creating an immutable branch were so
> > difficult. Isn't it just a simple branch-off either from the certain
> > upstream point (final release or rc) or from your stable branch?
>
> You'd be surprised.
>
> When applying patches, I normally apply them to a mail folder for
> further processing. This works great for patches that are applied to
> my main branch, but this does not work for immutable branches. These
> have to be applied on their own, thus need a 'special' or at least an
> empty folder.
Well, this isn't always requested -- at least, the simple case like
this one doesn't need to treat so much specially. We just need a
persistent branch that will be never rebased. It's the only
requirement.
That said, it's even enough just to branch off from your normal MFD
development branch, by a simple guarantee that you won't rebase *that*
branch any longer.
So, it's also a kind of "immutable branch", but it's much easier than
your regular workflow for the complex merge below.
Of course, a "cleaner" branch is preferred, but it doesn't matter much
as long as all stuff there will be merged to upstream sooner or
later.
thanks,
Takashi
>
> - Checkout a new branch based on the same (or earlier, but I always
> use the same) commit as the main branch.
>
> - Apply the patches in the normal way, only this time you usually need
> to interactively rebase and 'reword' them to add any missing
> Acks/Reviewed-bys.
>
> - Tag and sign the branch with a suitable tag name and tag
> description.
>
> - Push branch and tag
>
> - Create pull-request text
>
> - Send a formatted email with the pull-request text.
>
> This process is quite a lot more involved than simply applying
> relevant patches to your main branch, and as I say, if this was
> required for all patch-sets I am sent or involved in, it would really
> eat into my day.
>
> --
> Lee Jones
> Linaro STMicroelectronics Landing Team Lead
> Linaro.org │ Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog
>
next prev parent reply other threads:[~2017-09-06 15:02 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-04 14:43 [PATCH v5 0/3] Dollar Cove TI PMIC support for Intel Cherry Trail Takashi Iwai
2017-09-04 14:43 ` [PATCH v5 1/3] mfd: Add support for Cherry Trail Dollar Cove TI PMIC Takashi Iwai
2017-09-05 7:24 ` Lee Jones
2017-09-05 7:46 ` Takashi Iwai
2017-09-05 8:00 ` Hans de Goede
2017-09-05 8:11 ` Lee Jones
2017-09-05 8:12 ` Takashi Iwai
2017-09-05 8:10 ` Lee Jones
2017-09-05 8:20 ` Takashi Iwai
2017-09-05 8:53 ` Lee Jones
2017-09-05 9:38 ` Takashi Iwai
2017-09-05 10:31 ` Rafael J. Wysocki
2017-09-06 7:58 ` Lee Jones
2017-09-06 10:09 ` Rafael J. Wysocki
2017-09-06 10:47 ` Lee Jones
2017-09-06 10:52 ` Lee Jones
2017-09-06 22:19 ` Rafael J. Wysocki
2017-09-07 7:39 ` Lee Jones
2017-09-07 10:52 ` Rafael J. Wysocki
2017-09-07 11:07 ` Mika Westerberg
2017-09-07 10:59 ` Rafael J. Wysocki
2017-09-07 11:13 ` Lee Jones
2017-09-06 7:54 ` Lee Jones
2017-09-06 8:23 ` Takashi Iwai
2017-09-06 9:05 ` Lee Jones
2017-09-06 10:06 ` Takashi Iwai
2017-09-06 10:21 ` Rafael J. Wysocki
2017-09-06 10:50 ` Lee Jones
2017-09-06 10:40 ` Lee Jones
2017-09-06 10:58 ` Takashi Iwai
2017-09-06 11:01 ` Rafael J. Wysocki
2017-09-06 13:51 ` Lee Jones
2017-09-06 14:34 ` Takashi Iwai
2017-09-06 14:54 ` Lee Jones
2017-09-06 15:02 ` Takashi Iwai [this message]
2017-09-05 8:54 ` Lee Jones
2017-09-07 9:32 ` Takashi Iwai
2017-09-07 10:53 ` Lee Jones
2017-09-07 10:59 ` Rafael J. Wysocki
2017-09-07 11:17 ` Lee Jones
2017-09-07 11:44 ` Takashi Iwai
2017-09-07 12:24 ` Lee Jones
2017-09-07 13:11 ` Takashi Iwai
2017-09-07 13:22 ` Lee Jones
2017-09-07 8:00 ` Lee Jones
2017-09-04 14:43 ` [PATCH v5 2/3] platform/x86: Add support for Dollar Cove TI power button Takashi Iwai
2017-09-04 14:43 ` [PATCH v5 3/3] ACPI / PMIC: Add opregion driver for Intel Dollar Cove TI PMIC Takashi Iwai
2017-09-07 8:00 ` Lee Jones
-- strict thread matches above, loose matches on Subject: below --
2017-08-24 8:11 [PATCH v2 0/3] Dollar Cove TI PMIC support for Intel Cherry Trail Takashi Iwai
2017-08-24 8:11 ` [PATCH v2 1/3] mfd: Add support for Cherry Trail Dollar Cove TI PMIC Takashi Iwai
2017-08-24 9:03 ` Mika Westerberg
2017-08-24 9:17 ` Andy Shevchenko
2017-09-04 13:37 ` Lee Jones
2017-09-04 13:50 ` Takashi Iwai
2017-09-05 7:25 ` Lee Jones
2017-09-05 7:41 ` Takashi Iwai
2017-09-05 8:14 ` Lee Jones
2017-08-24 8:11 ` [PATCH v2 2/3] platform/x86: Add support for Dollar Cove TI power button Takashi Iwai
2017-08-24 9:07 ` Mika Westerberg
2017-08-24 9:20 ` Andy Shevchenko
2017-08-24 9:45 ` Takashi Iwai
2017-08-24 11:47 ` Andy Shevchenko
2017-09-07 11:41 ` [PATCH v5 1/3] mfd: Add support for Cherry Trail Dollar Cove TI PMIC Takashi Iwai
2017-09-07 12:28 ` Lee Jones
2017-09-07 12:48 ` Takashi Iwai
2017-09-07 13:00 ` Lee Jones
2017-09-07 13:30 ` Takashi Iwai
2017-09-07 14:13 ` Lee Jones
2017-08-24 8:11 ` [PATCH v2 3/3] ACPI / PMIC: Add opregion driver for Intel " Takashi Iwai
2017-08-24 9:14 ` Mika Westerberg
2017-08-24 9:40 ` Takashi Iwai
2017-08-24 10:03 ` Takashi Iwai
2017-08-24 9:23 ` Andy Shevchenko
2017-08-24 9:43 ` Takashi Iwai
2017-08-24 9:27 ` [PATCH v2 0/3] Dollar Cove TI PMIC support for Intel Cherry Trail Andy Shevchenko
2017-08-24 9:38 ` Takashi Iwai
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=s5htw0fkgz2.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=andy@infradead.org \
--cc=dmitry.torokhov@gmail.com \
--cc=dvhart@infradead.org \
--cc=hdegoede@redhat.com \
--cc=js@sig21.net \
--cc=lee.jones@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rjw@rjwysocki.net \
/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;
as well as URLs for NNTP newsgroup(s).