From: Sasha Levin <sashal@kernel.org>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: Codrin.Ciubotariu@microchip.com, havasiefr@gmail.com,
stable@vger.kernel.org
Subject: Re: duplicated patch in 5.4
Date: Mon, 7 Sep 2020 14:29:57 -0400 [thread overview]
Message-ID: <20200907182957.GO8670@sasha-vm> (raw)
In-Reply-To: <20200907173154.GA1016021@kroah.com>
On Mon, Sep 07, 2020 at 07:31:54PM +0200, Greg KH wrote:
>On Mon, Sep 07, 2020 at 05:15:49PM +0000, Codrin.Ciubotariu@microchip.com wrote:
>> On 07.09.2020 17:24, Kristof Havasi wrote:
>> > Dear Ciubatariu,
>> >
>> > as I am not familiar with the linux development workflow, I am
>> > contacting you directly as the author of the upstream patch:
>> > af199a1a9cb02ec0194804bd46c174b6db262075
>> >
>> > I noticed that your addition there was applied twice into 5.4 [1]
>> >
>> > d9b8206e5323ae3c9b5b4177478a1224108642f7 v5.4.51-45-gd9b8206e5323
>> > d55dad8b1d893fae0c4e778abf2ace048bcbad86 v5.4.52-13-gd55dad8b1d89
>> >
>> > resulting in a non-harmful, but unnecessary double setting of the variable.
>> >
>> > /* set the real number of ports */
>> > dev->ds->num_ports = dev->port_cnt;
>> >
>> > /* set the real number of ports */
>> > dev->ds->num_ports = dev->port_cnt;
>> >
>> > return 0;
>> >
>> > Could you notify the stable maintainers to apply your patch correctly?
>> >
>> > Best regards,
>> > Kristóf Havasi
>> >
>> >
>> > [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/drivers/net/dsa/microchip/ksz8795.c?h=v5.4.63#n1274
>> >
>>
>> Hello,
>>
>> Kristóf discovered that one patch of mine was applied twice. What is the
>> best way to address this?
>
>Send us a revert would be best.
I'll queue up a revert, nothing else is required on your end, thanks for
reporting!
--
Thanks,
Sasha
next prev parent reply other threads:[~2020-09-07 18:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CADBnMvh6gODocz8=fNE0wVcv71SdHKNtee7hAZev6OdZ7EZcAw@mail.gmail.com>
2020-09-07 17:15 ` duplicated patch in 5.4 Codrin.Ciubotariu
2020-09-07 17:31 ` Greg KH
2020-09-07 18:29 ` Sasha Levin [this message]
2020-09-07 18:43 ` Kristof Havasi
2020-09-08 15:51 ` Codrin.Ciubotariu
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=20200907182957.GO8670@sasha-vm \
--to=sashal@kernel.org \
--cc=Codrin.Ciubotariu@microchip.com \
--cc=gregkh@linuxfoundation.org \
--cc=havasiefr@gmail.com \
--cc=stable@vger.kernel.org \
/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