From: Linus Walleij <linus.walleij@linaro.org>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Biju Das <biju.das.jz@bp.renesas.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rob Herring <robh@kernel.org>
Subject: Re: linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree
Date: Mon, 21 Aug 2023 12:44:43 +0200 [thread overview]
Message-ID: <CACRpkdYu5WVQPpz5GE4cqjLJS_bpi-r++FeAw7CKovqvWd0knw@mail.gmail.com> (raw)
In-Reply-To: <CAMuHMdWQFYZS8qACEsaZvMEuvrVY3Ag0pJBi1SE6Kkj8tTMbrg@mail.gmail.com>
On Fri, Aug 18, 2023 at 1:26 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
>
> The resolution LGTM. Thanks!
The conflict is local to the pinctrl tree now, Torvalds will fix this
conflict when I send my pull request for v6.6 to him.
Yours,
Linus Walleij
next prev parent reply other threads:[~2023-08-21 10:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-18 6:08 Stephen Rothwell
2023-08-18 11:26 ` Geert Uytterhoeven
2023-08-21 10:44 ` Linus Walleij [this message]
2025-08-20 3:02 Stephen Rothwell
2025-08-20 7:02 ` Geert Uytterhoeven
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=CACRpkdYu5WVQPpz5GE4cqjLJS_bpi-r++FeAw7CKovqvWd0knw@mail.gmail.com \
--to=linus.walleij@linaro.org \
--cc=biju.das.jz@bp.renesas.com \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robh@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
all inboxes | Powered by JetHome®