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

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  drivers/acpi/nfit/core.c

between commit:

  4317874eac96f ("ACPI: NFIT: add missing MODULE_DESCRIPTION() macro")

from the pm tree and commit:

  3101daba2b086 ("ACPI: NFIT: add missing MODULE_DESCRIPTION() macro")

from the nvdimm 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 --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index e8520fb8af4fb..5429ec9ef06f0 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -3531,6 +3531,6 @@ static __exit void nfit_exit(void)
 
 module_init(nfit_init);
 module_exit(nfit_exit);
-MODULE_DESCRIPTION("ACPI NVDIMM Firmware Interface Table (NFIT) module");
+MODULE_DESCRIPTION("ACPI NVDIMM Firmware Interface Table (NFIT) driver");
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Intel Corporation");

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