From: Drew Fustini <drew@pdp7.com>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Networking <netdev@vger.kernel.org>,
Drew Fustini <dfustini@tenstorrent.com>,
Emil Renner Berthing <emil.renner.berthing@canonical.com>,
Jisheng Zhang <jszhang@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the pinctrl tree with the net-next tree
Date: Thu, 7 Nov 2024 18:37:39 -0800 [thread overview]
Message-ID: <Zy15czmqRLN4Ov4u@x1> (raw)
In-Reply-To: <CACRpkdaxB1APxK_rRFEhcwBw0JZc20YN0z_881_iYVxeKs95LQ@mail.gmail.com>
On Thu, Nov 07, 2024 at 02:59:25PM +0100, Linus Walleij wrote:
> On Thu, Nov 7, 2024 at 11:43 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Today's linux-next merge of the pinctrl tree got a conflict in:
> >
> > MAINTAINERS
>
> Thanks Stephen, looks trivial enough but will try to remember to mention
> this to Torvalds.
>
> Yours,
> Linus Walleij
Thank you for handling this conflict.
Drew
prev parent reply other threads:[~2024-11-08 2:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-07 10:43 linux-next: manual merge of the pinctrl tree with the net-next tree Stephen Rothwell
2024-11-07 13:59 ` Linus Walleij
2024-11-08 2:37 ` Drew Fustini [this message]
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=Zy15czmqRLN4Ov4u@x1 \
--to=drew@pdp7.com \
--cc=davem@davemloft.net \
--cc=dfustini@tenstorrent.com \
--cc=emil.renner.berthing@canonical.com \
--cc=jszhang@kernel.org \
--cc=kuba@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--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