On Mon, Dec 13, 2021 at 11:57:49AM -0500, Ralph Siemsen wrote: > Hi Greg, > > On Mon, Dec 13, 2021 at 09:32:11AM +0100, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > This is a note to let you know that I've just added the patch titled > > > > nvmem: eeprom: at25: fix FRAM byte_len > > > > to the 5.15-stable tree which can be found at: > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > > > The filename of the patch is: > > nvmem-eeprom-at25-fix-fram-byte_len.patch > > and it can be found in the queue-5.15 subdirectory. > > > > If you, or anyone else, feels it should not be added to the stable tree, > > please let <stable@xxxxxxxxxxxxxxx> know about it. > > I submitted this patch, and was not aware that it got merged into mainline > already. Subsequently, a series by Andy Shevchenko was submitted via > char-misc tree, which includes the same fix, along with further cleanups. > Naturally it conflicts with my patch: > https://lore.kernel.org/all/20211206144901.63529ac9@xxxxxxxxxxxxxxxx/ That is already merged in my tree, so your patch did not "go away". Also Andy's series does more and is not marked for stable. > I therefore recommend dropping my patch (and reverting it from mainline) in > favour of Andy's series. Let me know if I need to take any actions to make > this happen. No need to revert your patch or drop it, it is needed now for 5.16-final and the stable trees. Andy's rework will get merged for 5.17-rc1. thanks, greg k-h
