| Message ID | 20210427210121.1080364-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b5144a2bf401f06962761b9d16ad8f0983213582 |
| Headers | show |
| Series | dt-bindings: nvmem: mediatek: remove duplicate mt8192 line | expand |
Hello: This patch was applied to soc/soc.git (refs/heads/arm/fixes): On Tue, 27 Apr 2021 23:01:08 +0200 you wrote: > From: Arnd Bergmann <arnd@arndb.de> > > The same patch was accidentally merged twice, resulting in a > duplicate line for the mt8192 SoC. > > Fixes: f2674c0c7488 ("dt-bindings: nvmem: mediatek: add support for MediaTek mt8192 SoC") > Fixes: 2a1405a14c3a ("dt-bindings: nvmem: mediatek: add support for MediaTek mt8192 SoC") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > [...] Here is the summary with links: - dt-bindings: nvmem: mediatek: remove duplicate mt8192 line https://git.kernel.org/soc/soc/c/b5144a2bf401 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
On Tue, Apr 27, 2021 at 11:01:08PM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > The same patch was accidentally merged twice, resulting in a > duplicate line for the mt8192 SoC. > > Fixes: f2674c0c7488 ("dt-bindings: nvmem: mediatek: add support for MediaTek mt8192 SoC") > Fixes: 2a1405a14c3a ("dt-bindings: nvmem: mediatek: add support for MediaTek mt8192 SoC") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > Documentation/devicetree/bindings/nvmem/mtk-efuse.txt | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt b/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt > index d479ad977e24..2f2895b1f06d 100644 > --- a/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt > +++ b/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt > @@ -7,7 +7,6 @@ Required properties: > "mediatek,mt7622-efuse", "mediatek,efuse": for MT7622 > "mediatek,mt7623-efuse", "mediatek,efuse": for MT7623 > "mediatek,mt8173-efuse" or "mediatek,efuse": for MT8173 > - "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192 > "mediatek,mt8516-efuse", "mediatek,efuse": for MT8516 > "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192 Shouldn't you drop the bottom one here to keep this in sorted order? thanks, greg k-h
On Wed, Apr 28, 2021 at 8:12 AM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > @@ -7,7 +7,6 @@ Required properties: > > "mediatek,mt7622-efuse", "mediatek,efuse": for MT7622 > > "mediatek,mt7623-efuse", "mediatek,efuse": for MT7623 > > "mediatek,mt8173-efuse" or "mediatek,efuse": for MT8173 > > - "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192 > > "mediatek,mt8516-efuse", "mediatek,efuse": for MT8516 > > "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192 > > Shouldn't you drop the bottom one here to keep this in sorted order? Indeed. For some reason I assumed they were meant to be in chronological order, but you are right that the others are all sorted alphanumerically. Fixed in the arm/fixes branch, it was the only commit there. Thanks! Arnd
diff --git a/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt b/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt index d479ad977e24..2f2895b1f06d 100644 --- a/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt +++ b/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt @@ -7,7 +7,6 @@ Required properties: "mediatek,mt7622-efuse", "mediatek,efuse": for MT7622 "mediatek,mt7623-efuse", "mediatek,efuse": for MT7623 "mediatek,mt8173-efuse" or "mediatek,efuse": for MT8173 - "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192 "mediatek,mt8516-efuse", "mediatek,efuse": for MT8516 "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192 - reg: Should contain registers location and length