Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: <Codrin.Ciubotariu@microchip.com>
To: <havasiefr@gmail.com>, <stable@vger.kernel.org>,
	<gregkh@linuxfoundation.org>
Subject: Re: duplicated patch in 5.4
Date: Mon, 7 Sep 2020 17:15:49 +0000	[thread overview]
Message-ID: <788f9aa0-f03d-c736-a8a1-9a989f2e9c6e@microchip.com> (raw)
In-Reply-To: <CADBnMvh6gODocz8=fNE0wVcv71SdHKNtee7hAZev6OdZ7EZcAw@mail.gmail.com>

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

       reply	other threads:[~2020-09-07 17:16 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 ` Codrin.Ciubotariu [this message]
2020-09-07 17:31   ` duplicated patch in 5.4 Greg KH
2020-09-07 18:29     ` Sasha Levin
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=788f9aa0-f03d-c736-a8a1-9a989f2e9c6e@microchip.com \
    --to=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