linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lukas Wunner <lukas@wunner.de>
To: ronald@innovation.ch,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Andrzej Hajda <a.hajda@samsung.com>,
	Inki Dae <inki.dae@samsung.com>,
	dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	linux-input@vger.kernel.org
Subject: Re: [PATCH] drm/bridge: sil_sii8620: depend on INPUT instead of selecting it.
Date: Thu, 24 Jan 2019 10:13:42 +0100	[thread overview]
Message-ID: <20190124091342.i4g3hwzpnt5uwwxf@wunner.de> (raw)
In-Reply-To: <20190124072125.GA28127@innovation.ch>

On Wed, Jan 23, 2019 at 11:21:25PM -0800, Life is hard, and then you die wrote:
> Since the two changes (the change here + the new driver) seem to be
> best submitted through different trees, I'm trying to figure out how
> best to handle this. I suppose I could temporarily change the driver
> Kconfig to not trigger the conflict, and then once the change here has
> been upstreamed (not sure at what point exactly that would be
> considered the case, e.g. if in linux-next is sufficient, or has to
> wait for Linus' merge, or something else) submit another change to
> change the driver's Kconfig to the desired one.

If a series touches multiple subsystems and its patches are interdependent,
the pull requests sent to Linus would have to be merged in a specific order.

In practice that's too cumbersome, so either the series is split in multiple
parts and merged across multiple releases (which obviously can take a long
time) or, if the change to other subsystems is smallish (as is the case
here), the entire series is merged through a single subsystem tree and
those patches touching other subsystems need to have an Acked-by or
Reviewed-by tag from a maintainer of those other subsystems.

If a case can be made that the change to the other subsystem (e.g. DRM) is
actually a bug fix, then that change can go in immediately and will appear
in one of Linus' next -rc releases.  The rest of the series can then go
through the appropriate subsystem (e.g. input) and will land in Linus' tree
in the next merge window.

Either way, the correct patch order is preserved and it's guaranteed that
the build is not broken for someone ending up on an in-between commit while
bisecting.

HTH,

Lukas

  parent reply	other threads:[~2019-01-24  9:13 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-22 14:13 [PATCH] drm/bridge: sil_sii8620: depend on INPUT instead of selecting it Ronald Tschalär
2019-01-22 21:10 ` Laurent Pinchart
2019-01-24  7:23   ` Life is hard, and then you die
2019-01-23  8:45 ` Lukas Wunner
2019-01-23 22:03   ` Dmitry Torokhov
2019-01-23 22:17     ` Laurent Pinchart
2019-01-23 22:21       ` Dmitry Torokhov
2019-01-23 22:22         ` Laurent Pinchart
2019-01-24  7:21           ` Life is hard, and then you die
2019-01-24  8:24             ` [PATCH v2] drm/bridge: sil_sii8620: make remote control optional Ronald Tschalär
2019-01-24  9:13             ` Lukas Wunner [this message]
2019-01-25  1:33             ` Ronald Tschalär
2019-01-28 10:53               ` Andrzej Hajda
2019-03-28  1:07                 ` Life is hard, and then you die
2019-03-04  2:13               ` Life is hard, and then you die
2019-03-04  7:13                 ` Andrzej Hajda
2019-04-07  1:30               ` [PATCH v3] " Ronald Tschalär

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=20190124091342.i4g3hwzpnt5uwwxf@wunner.de \
    --to=lukas@wunner.de \
    --cc=a.hajda@samsung.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=inki.dae@samsung.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ronald@innovation.ch \
    /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).