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

[Ira Weiny <ira.weiny@intel.com>]

Mark Brown wrote:
> 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.

Thank you.

> 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.

I should have realized that something under acpi would potentially be
picked up from someone else I just did not think anyone would have for
done so for nfit.

Thanks for fixing this up,
Ira

> 
> 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");