linux-next: manual merge of the nvmem tree with the char-misc.current tree

--coL2RbFUho3cxWhT
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/nvmem/layouts/Makefile

between commit:

  b5be879519291 ("nvmem: layouts: Add fixed-layout driver")

=66rom the char-misc.current tree and commits:

  c00ca6cc2fc96 ("nvmem: layouts: Add fixed-layout driver")
  eeb4218f73b55 ("nvmem: layouts: Make the fixed-layout driver optional")

=66rom 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.

diff --combined drivers/nvmem/layouts/Makefile
index dd6c6c70b1a92,9da790a9dde9e..0000000000000
--- a/drivers/nvmem/layouts/Makefile
+++ b/drivers/nvmem/layouts/Makefile
@@@ -3,7 -3,7 +3,7 @@@
  # Makefile for nvmem layouts.
  #
 =20
- obj-$(CONFIG_NVMEM_LAYOUTS) +=3D fixed-layout.o
+ obj-$(CONFIG_NVMEM_LAYOUT_FIXED_LAYOUT) +=3D fixed-layout.o
  obj-$(CONFIG_NVMEM_LAYOUT_SL28_VPD) +=3D sl28vpd.o
  obj-$(CONFIG_NVMEM_LAYOUT_ONIE_TLV) +=3D onie-tlv.o
  obj-$(CONFIG_NVMEM_LAYOUT_U_BOOT_ENV) +=3D u-boot-env.o

--coL2RbFUho3cxWhT
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmpsuu0ACgkQJNaLcl1U
h9AP/wf/SErCzhCCAQQ9anetEnDRTj8OBsU5SUEuvDBgq4VDd5v0iozWHwcXPpv6
j0lyoylGxYFjn8Gir1qmks/CuWrXWOsFfM/SRa/jiTH9uMoPHcLZsEp+jTY/dZCt
Af0ws+3B93X5h3uYro8DhwVfSUK1UgaZvaxlMUqkeG06hBlLgPGMQ8D9gJ2CEN9L
xw8ldoCuVuLZmvaZFW4Ri3+Bfv4i2jYE03L0oQn+09pHtNiBJzaqUnGc1V8tWNWk
CDpqh9L3Hp/jPKtXURkEW4lZ9ZdS6I0qd4AdswUVNsFIUEUROd365/wBK/6806Aq
Pjd7254K+EGFlxM73Yh/OMgqCNiysQ==
=bZ+P
-----END PGP SIGNATURE-----

--coL2RbFUho3cxWhT--