* Re: duplicated patch in 5.4
[not found] <CADBnMvh6gODocz8=fNE0wVcv71SdHKNtee7hAZev6OdZ7EZcAw@mail.gmail.com>
@ 2020-09-07 17:15 ` Codrin.Ciubotariu
2020-09-07 17:31 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Codrin.Ciubotariu @ 2020-09-07 17:15 UTC (permalink / raw)
To: havasiefr, stable, gregkh
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?
Thank you Kristóf for finding this.
Best regards,
Codrin
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: duplicated patch in 5.4
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
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2020-09-07 17:31 UTC (permalink / raw)
To: Codrin.Ciubotariu; +Cc: havasiefr, stable
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.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: duplicated patch in 5.4
2020-09-07 17:31 ` Greg KH
@ 2020-09-07 18:29 ` Sasha Levin
2020-09-07 18:43 ` Kristof Havasi
2020-09-08 15:51 ` Codrin.Ciubotariu
0 siblings, 2 replies; 5+ messages in thread
From: Sasha Levin @ 2020-09-07 18:29 UTC (permalink / raw)
To: Greg KH; +Cc: Codrin.Ciubotariu, havasiefr, stable
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: duplicated patch in 5.4
2020-09-07 18:29 ` Sasha Levin
@ 2020-09-07 18:43 ` Kristof Havasi
2020-09-08 15:51 ` Codrin.Ciubotariu
1 sibling, 0 replies; 5+ messages in thread
From: Kristof Havasi @ 2020-09-07 18:43 UTC (permalink / raw)
To: Sasha Levin; +Cc: Greg KH, Codrin.Ciubotariu, stable
On Mon, 7 Sep 2020 at 20:29, Sasha Levin <sashal@kernel.org> wrote:
>
> 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
Honestly, I am impressed how responsive this community is!
Thank you for your responses!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: duplicated patch in 5.4
2020-09-07 18:29 ` Sasha Levin
2020-09-07 18:43 ` Kristof Havasi
@ 2020-09-08 15:51 ` Codrin.Ciubotariu
1 sibling, 0 replies; 5+ messages in thread
From: Codrin.Ciubotariu @ 2020-09-08 15:51 UTC (permalink / raw)
To: sashal, gregkh; +Cc: havasiefr, stable
On 07.09.2020 21:29, Sasha Levin wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know
> the content is safe
>
> 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!
Great! Thanks everyone!
Best regards,
Codrin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-09-08 19:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[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
2020-09-07 18:43 ` Kristof Havasi
2020-09-08 15:51 ` Codrin.Ciubotariu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox