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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20230306105123.5ea1acc0@canb.auug.org.au>
Date:   Mon, 6 Mar 2023 10:51:23 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patches in the nvmem tree

Hi,

On Mon, 6 Feb 2023 08:32:15 +1100 Stephen Rothwell <sfr@...b.auug.org.au> 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

Content of type "application/pgp-signature" skipped