linux-next: manual merge of the cxl tree with the nvdimm tree

linux-next: manual merge of the cxl tree with the nvdimm tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1016 bytes --]

Hi all,

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

  drivers/dax/Makefile

between commit:

  d5406bd458b0a ("dax: add fsdev.c driver for fs-dax on character dax")

from the nvdimm tree and commit:

  39aa1d4be12bf ("dax/cxl, hmem: Initialize hmem early and defer dax_cxl binding")

from the cxl 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 --cc drivers/dax/Makefile
index ba35bda7abefe,70e996bf15261..0000000000000
--- a/drivers/dax/Makefile
+++ b/drivers/dax/Makefile
@@@ -11,6 -11,3 +12,4 @@@ dax-y += bus.
  device_dax-y := device.o
  dax_pmem-y := pmem.o
  dax_cxl-y := cxl.o
 +fsdev_dax-y := fsdev.o
- 
- obj-y += hmem/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]