From: Andre Przywara <andre.przywara@arm.com>
To: Paolo Abeni <pabeni@redhat.com>
Cc: Jakub Kicinski <kuba@kernel.org>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
linux-usb@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Greg KH <gregkh@linuxfoundation.org>
Subject: Re: [PATCH net-next] r8152: add vendor/device ID pair for Microsoft Devkit
Date: Thu, 12 Jan 2023 11:56:59 +0000 [thread overview]
Message-ID: <20230112115659.27fb453d@donnerap.cambridge.arm.com> (raw)
In-Reply-To: <4c48269962dafbb641d5b0c38ec5b7bf951f3b4d.camel@redhat.com>
On Thu, 12 Jan 2023 12:39:01 +0100
Paolo Abeni <pabeni@redhat.com> wrote:
Hi,
> On Thu, 2023-01-12 at 10:51 +0000, Andre Przywara wrote:
> > On Wed, 11 Jan 2023 21:31:43 -0800 Jakub Kicinski <kuba@kernel.org> wrote:
> > > Hm, we have a patch in net-next which reformats the entries:
> > > ec51fbd1b8a2bca2948dede99c14ec63dc57ff6b
> > >
> > > Would you like this ID to be also added in stable? We could just
> > > apply it to net, and deal with the conflict locally. But if you
> > > don't care about older kernels then better if you rebase.
> >
> > Stable would be nice, but only to v6.1. I think I don't care
> > about older kernels.
> > So what about if I resend this one here, based on top of the reformat
> > patch, with a:
> > Cc: <stable@vger.kernel.org> # 6.1.x
> > line in there, and then reply to the email that the automatic backport
> > failed, with a tailored patch for v6.1?
> > Alternatively I can send an explicit stable backport email once this one
> > is merged.
>
> Note that we can merge this kind of changes via the -net tree. No
> repost will be needed. We can merge it as is on -net and you can follow
> the option 2 from the stable kernel rules doc, with no repost nor
> additional mangling for stable will be needed.
>
> If you are ok with the above let me know.
That sounds good to me, but that will then trigger a merge conflict when
net-next (with the reformat patch) is merged? I guess it's easy enough to
solve, but that would be extra work on your side. If you are fine with
that, it's OK for me.
Thanks,
Andre
next prev parent reply other threads:[~2023-01-12 12:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-11 13:32 [PATCH net-next] r8152: add vendor/device ID pair for Microsoft Devkit Andre Przywara
2023-01-12 5:31 ` Jakub Kicinski
2023-01-12 8:33 ` Bjørn Mork
2023-01-12 10:00 ` Greg KH
2023-01-12 10:01 ` [PATCH net-next] r8152; preserve device list format Bjørn Mork
2023-01-12 10:12 ` Greg KH
2023-01-12 10:18 ` Bjørn Mork
2023-01-12 10:21 ` Greg KH
2023-01-12 10:29 ` Bjørn Mork
2023-01-12 10:36 ` Greg KH
2023-01-13 10:16 ` Bjørn Mork
2023-01-13 19:54 ` Jakub Kicinski
2023-01-12 10:51 ` [PATCH net-next] r8152: add vendor/device ID pair for Microsoft Devkit Andre Przywara
2023-01-12 11:39 ` Paolo Abeni
2023-01-12 11:56 ` Andre Przywara [this message]
2023-01-12 13:08 ` Paolo Abeni
2023-01-12 13:40 ` patchwork-bot+netdevbpf
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=20230112115659.27fb453d@donnerap.cambridge.arm.com \
--to=andre.przywara@arm.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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 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).