From: Lee Jones <lee@kernel•org>
To: Bartosz Golaszewski <brgl@bgdev•pl>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: duplicate patch in the gpio-brgl tree
Date: Mon, 26 Feb 2024 13:44:08 +0000 [thread overview]
Message-ID: <20240226134408.GA37938@google.com> (raw)
In-Reply-To: <CAMRc=Md3pfEWcMSoVjdj7_o9MJQUShfKL6=XyWVm3MqEWKFX9Q@mail.gmail.com>
On Mon, 26 Feb 2024, Bartosz Golaszewski wrote:
> On Mon, Feb 26, 2024 at 12:04 PM Lee Jones <lee@kernel•org> wrote:
> >
> > On Mon, 26 Feb 2024, Bartosz Golaszewski wrote:
> >
> > > On Mon, Feb 26, 2024 at 7:41 AM Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> > > >
> > > > Hi all,
> > > >
> > > > The following commit is also in the mfd tree as A different commit
> > > > (but the same patch):
> > > >
> > > > 4a7b0850fc7a ("dt-bindings: cros-ec: Add properties for GPIO controller")
> > > >
> > > > This is commit
> > > >
> > > > 7b79740d42e7 ("dt-bindings: mfd: cros-ec: Add properties for GPIO controller")
> > > >
> > > > in the mfd tree.
> > > >
> > > > --
> > > > Cheers,
> > > > Stephen Rothwell
> > >
> > > Hi Stephen, Lee!
> > >
> > > I picked it up because I was already queuing the patch adding the GPIO
> > > driver. Unless there are conflicts with the MFD branch (doesn't seem
> > > like it?), I think it should go through the GPIO branch together with
> > > the driver.
> >
> > This is the first I've heard of it. There was no reply from you, even
> > after I specifically asked you for an explanation.
> >
>
> Huh, I now see your email in lore[1] but I don't have it in my inbox,
> not even in spam. I would have answered otherwise.
>
> > There is no convincing reason for this to follow the C change. It's
> > more important to avoid Linus from facing merge-conflicts during the
> > merge-window. Please remove the patch from your tree.
> >
>
> This is why I'm asking if this caused a conflict. Whatever, I'll drop
> it alright.
Maybe there aren't any conflicts yet, but we are still early in the
cycle and prevention is better than cure. Thanks for dropping it.
--
Lee Jones [李琼斯]
next prev parent reply other threads:[~2024-02-26 13:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 6:41 linux-next: duplicate patch in the gpio-brgl tree Stephen Rothwell
2024-02-26 10:02 ` Bartosz Golaszewski
2024-02-26 11:04 ` Lee Jones
2024-02-26 13:37 ` Bartosz Golaszewski
2024-02-26 13:44 ` Lee Jones [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-23 1:52 Stephen Rothwell
2025-10-23 7:48 ` Bartosz Golaszewski
2025-10-23 8:56 ` Stephen Rothwell
2025-10-26 21:17 Stephen Rothwell
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=20240226134408.GA37938@google.com \
--to=lee@kernel$(echo .)org \
--cc=brgl@bgdev$(echo .)pl \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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