From: Dan Williams <dan.j.williams@intel.com>
To: Mark Brown <broonie@kernel.org>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>,
Yi Zhang <yi.zhang@redhat.com>, Jeff Moyer <jmoyer@redhat.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the nvdimm tree with the libnvdimm-fixes tree
Date: Thu, 19 Sep 2019 08:27:40 -0700 [thread overview]
Message-ID: <CAPcyv4hq2N2H-HszhEm-rT2YziTLSeU1A5ea19-bDvSXMZLjCw@mail.gmail.com> (raw)
In-Reply-To: <20190919150147.GO3642@sirena.co.uk>
On Thu, Sep 19, 2019 at 8:02 AM Mark Brown <broonie@kernel.org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the nvdimm tree got a conflict in:
>
> drivers/nvdimm/pfn_devs.c
>
> between commit:
>
> 274b924088e935 ("libnvdimm/pfn: Fix namespace creation on misaligned addresses")
>
> from the libnvdimm-fixes tree and commit:
>
> edbb52c24441ab ("libnvdimm/pfn_dev: Add page size and struct page size to pfn superblock")
>
> 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 --cc drivers/nvdimm/pfn_devs.c
> index cb98b8fe786e2,80c7992bc5389..0000000000000
> --- a/drivers/nvdimm/pfn_devs.c
> +++ b/drivers/nvdimm/pfn_devs.c
> @@@ -724,9 -786,10 +788,11 @@@ static int nd_pfn_init(struct nd_pfn *n
> memcpy(pfn_sb->uuid, nd_pfn->uuid, 16);
> memcpy(pfn_sb->parent_uuid, nd_dev_to_uuid(&ndns->dev), 16);
> pfn_sb->version_major = cpu_to_le16(1);
> - pfn_sb->version_minor = cpu_to_le16(3);
> + pfn_sb->version_minor = cpu_to_le16(4);
> + pfn_sb->end_trunc = cpu_to_le32(end_trunc);
> pfn_sb->align = cpu_to_le32(nd_pfn->align);
> + pfn_sb->page_struct_size = cpu_to_le16(MAX_STRUCT_PAGE_SIZE);
> + pfn_sb->page_size = cpu_to_le32(PAGE_SIZE);
> checksum = nd_sb_checksum((struct nd_gen_sb *) pfn_sb);
> pfn_sb->checksum = cpu_to_le64(checksum);
Yes, looks correct. Apologies for not highlighting this conflict in advance.
prev parent reply other threads:[~2019-09-19 15:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 15:01 linux-next: manual merge of the nvdimm tree with the libnvdimm-fixes tree Mark Brown
2019-09-19 15:27 ` Dan Williams [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPcyv4hq2N2H-HszhEm-rT2YziTLSeU1A5ea19-bDvSXMZLjCw@mail.gmail.com \
--to=dan.j.williams@intel.com \
--cc=aneesh.kumar@linux.ibm.com \
--cc=broonie@kernel.org \
--cc=jmoyer@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=yi.zhang@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).