All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jiri Kosina <jikos@kernel.org>
To: Pavel Machek <pavel@ucw.cz>
Cc: Roderick Colenbrander <thunderbird2k@gmail.com>,
	Roderick Colenbrander <roderick@gaikai.com>,
	Benjamin Tissoires <benjamin.tissoires@redhat.com>,
	linux-input <linux-input@vger.kernel.org>,
	linux-leds@vger.kernel.org,
	"Daniel J . Ogorchock" <djogorchock@gmail.com>,
	Roderick Colenbrander <roderick.colenbrander@sony.com>
Subject: Re: [PATCH v3 2/3] leds: add new LED_FUNCTION_PLAYER for player LEDs for game controllers.
Date: Mon, 25 Oct 2021 11:36:43 +0200 (CEST)	[thread overview]
Message-ID: <nycvar.YFH.7.76.2110251127380.12554@cbobk.fhfr.pm> (raw)
In-Reply-To: <20211025091929.GA5878@amd>

On Mon, 25 Oct 2021, Pavel Machek wrote:

> > In other words: could you please elaborate what exact issue are you trying 
> > to avoid by not providing your Acked-by: and letting it go through hid.git 
> > with all the rest of the code depending on it?
> 
> I'm trying to avoid merge conflict.

What's wrong with this kind of conflict?

That's what linux-next is for; if there is a conflict, we'll be notified 
and if needed and we could indicate this to Linus during merge window. The 
trivial ones he resolves without any issues. And we'll know exactly what 
kind of conflict (if any at all) is there beforehand from linux-next.

> I believe open-coding string for a while is acceptable price to pay for 
> that, and I'd prefer that solution.

I don't. It's a mess. If you'd then for some reason change your mind on 
the last minute and did the numbering differently in your tree, it will go 
by unnoticed, while when the real conflict happens, it'll be a clear sign 
that there is a thing to resolve.

Conflict is not a bad thing per se that needs to be avoided at all costs.

Conflict clearly shows the dependency between the trees and is trivially 
resolved.

> If you can promise that no conflicts or other problems will happen for 
> either me or Linus... 

Linus doesn't care about this kind of hypothetical conflict if there is a 
reason for it, and he resolves them on a daily basis, just check the git 
history.

> go ahead and merge the patch.

Can I take this as your Acked-by: then, so that I can finally apply it and 
get the needed linux-next coverage before merge window opens?

-- 
Jiri Kosina
SUSE Labs


  reply	other threads:[~2021-10-25  9:36 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-08 16:55 [PATCH v3 0/3] HID: playstation: add LED support Roderick Colenbrander
2021-09-08 16:55 ` [PATCH v3 1/3] HID: playstation: expose DualSense lightbar through a multi-color LED Roderick Colenbrander
2021-09-08 16:55 ` [PATCH v3 2/3] leds: add new LED_FUNCTION_PLAYER for player LEDs for game controllers Roderick Colenbrander
2021-09-22  9:50   ` Jiri Kosina
2021-09-27 14:11     ` Pavel Machek
2021-09-27 16:29       ` Roderick Colenbrander
2021-10-07 10:34         ` Jiri Kosina
2021-10-13  7:48         ` Pavel Machek
2021-10-13 17:20           ` Roderick Colenbrander
2021-10-18 15:40           ` Jiri Kosina
2021-10-22  6:42             ` Jiri Kosina
2021-10-22  7:21               ` Pavel Machek
2021-10-22  7:27                 ` Jiri Kosina
2021-10-22  7:32                   ` Jiri Kosina
2021-10-25  9:19                     ` Pavel Machek
2021-10-25  9:36                       ` Jiri Kosina [this message]
2021-10-26 18:48                         ` Pavel Machek
2021-10-27  7:50                           ` Jiri Kosina
2021-09-08 16:55 ` [PATCH v3 3/3] HID: playstation: expose DualSense player LEDs through LED class Roderick Colenbrander

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=nycvar.YFH.7.76.2110251127380.12554@cbobk.fhfr.pm \
    --to=jikos@kernel.org \
    --cc=benjamin.tissoires@redhat.com \
    --cc=djogorchock@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-leds@vger.kernel.org \
    --cc=pavel@ucw.cz \
    --cc=roderick.colenbrander@sony.com \
    --cc=roderick@gaikai.com \
    --cc=thunderbird2k@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.