From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Lee Jones <lee@kernel.org>
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 14:37:20 +0100 [thread overview]
Message-ID: <CAMRc=Md3pfEWcMSoVjdj7_o9MJQUShfKL6=XyWVm3MqEWKFX9Q@mail.gmail.com> (raw)
In-Reply-To: <20240226110424.GA120668@google.com>
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.
Bartosz
> --
> Lee Jones [李琼斯]
[1] https://lore.kernel.org/lkml/20240223102039.GK10170@google.com/
next prev parent reply other threads:[~2024-02-26 13:37 UTC|newest]
Thread overview: 5+ 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 [this message]
2024-02-26 13:44 ` Lee Jones
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='CAMRc=Md3pfEWcMSoVjdj7_o9MJQUShfKL6=XyWVm3MqEWKFX9Q@mail.gmail.com' \
--to=brgl@bgdev.pl \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).