linux-kernel - linux-next: manual merge of the nvmem tree with the char-misc 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20220223212634.398789-1-broonie@kernel.org>
Date:   Wed, 23 Feb 2022 21:26:34 +0000
From:   broonie@...nel.org
To:     Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Michael Walle <michael@...le.cc>,
        Vincent Shih <vincent.sunplus@...il.com>
Subject: linux-next: manual merge of the nvmem tree with the char-misc tree

Hi all,

Today's linux-next merge of the nvmem tree got conflicts in:

  drivers/nvmem/Kconfig
  drivers/nvmem/Makefile

between commit:

  f78451012b9e1 ("nvmem: add driver for Layerscape SFP (Security Fuse Processor)")

from the char-misc tree and commits:

  1c565569b4704 ("nvmem: add driver for Layerscape SFP (Security Fuse Processor)")
  5293c629db958 ("nvmem: Add driver for OCOTP in Sunplus SP7021")

from the nvmem tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

[Took the version from the nvmem tree]