Re: linux-next: duplicate patches in the nvmem tree

From: Stephen Rothwell
Date: Sun Mar 05 2023 - 18:51:38 EST


Hi,

On Mon, 6 Feb 2023 08:32:15 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
>
> 03b6f71ceeb1 ("nvmem: core: fix cleanup after dev_set_name()")
> 6b868c1a2ec0 ("nvmem: sunxi_sid: Always use 32-bit MMIO reads")
> 957b1f840ce0 ("nvmem: brcm_nvram: Add check for kzalloc")
> 9afef75ce71c ("nvmem: core: remove nvmem_config wp_gpio")
> a895af2746e3 ("nvmem: core: fix return value")
> b02c75889942 ("nvmem: core: fix registration vs use race")
> b3a9be9040b7 ("nvmem: core: initialise nvmem->id early")
> ba716d020bc8 ("nvmem: qcom-spmi-sdam: fix module autoloading")
> c976fd0b6970 ("nvmem: core: fix device node refcounting")
> ee29286033ef ("nvmem: core: fix cell removal on error")

This duplication has now started causing conflicts ... please clean up
your tree now that v6.3-rc1 is out.

--
Cheers,
Stephen Rothwell

Attachment: pgp79Z9K2S5m4.pgp
Description: OpenPGP digital signature