From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58212C4CEC4 for ; Thu, 19 Sep 2019 15:02:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A6E921848 for ; Thu, 19 Sep 2019 15:02:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568905321; bh=GnTtgywfO1zuer3wD//cz3MZUM90IbdL/4Yt0duFEN8=; h=Date:From:To:Cc:Subject:List-ID:From; b=nLtfV3330SEhxBK4qgnexo+hox6YGH8UQg03zk8bvBHVEFQ1HOLiG/GoLZxnKIp9M eIIGmpVHO3xuWVlVXmDUDo/qhQHvGG8vALzkURyAqsF+8+xyAKb5Tfez1z4/uPRNnT W9UcFg+gdN99g33xYU5sutQFifj7csiQdokFzA70= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390887AbfISPCA (ORCPT ); Thu, 19 Sep 2019 11:02:00 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:46370 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389586AbfISPB7 (ORCPT ); Thu, 19 Sep 2019 11:01:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=WBYOGgHTyUustwZaXfY4IyXe0lajHxD9KsjkOCE9Jb0=; b=PuizwbktyjHwVSSPcg8jCanmz qNVS2YnmRJIRmNGB9/7CKV8FVpTkgp25DZsUHkdZKK/fRbl8rqD/MZnmCcACf1jcPGB2FaHkMR5Ta KV17nyypfjIKKqvLA+YSvNEcpbhgS4VzP8CuILY94TeQxxlhb/Y6S5Odmn+QQvsdPKc9I=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iAxwL-00049Y-SG; Thu, 19 Sep 2019 15:01:49 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id D45A82742939; Thu, 19 Sep 2019 16:01:47 +0100 (BST) Date: Thu, 19 Sep 2019 16:01:47 +0100 From: Mark Brown To: Dan Williams , "Aneesh Kumar K.V" , Yi Zhang , Jeff Moyer Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the nvdimm tree with the libnvdimm-fixes tree Message-ID: <20190919150147.GO3642@sirena.co.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="umrsQkkrw7viUWFs" Content-Disposition: inline X-Cookie: I'll be Grateful when they're Dead. User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --umrsQkkrw7viUWFs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 addr= esses") =66rom the libnvdimm-fixes tree and commit: edbb52c24441ab ("libnvdimm/pfn_dev: Add page size and struct page size to= pfn superblock") =66rom 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 =3D cpu_to_le16(1); - pfn_sb->version_minor =3D cpu_to_le16(3); + pfn_sb->version_minor =3D cpu_to_le16(4); + pfn_sb->end_trunc =3D cpu_to_le32(end_trunc); pfn_sb->align =3D cpu_to_le32(nd_pfn->align); + pfn_sb->page_struct_size =3D cpu_to_le16(MAX_STRUCT_PAGE_SIZE); + pfn_sb->page_size =3D cpu_to_le32(PAGE_SIZE); checksum =3D nd_sb_checksum((struct nd_gen_sb *) pfn_sb); pfn_sb->checksum =3D cpu_to_le64(checksum); =20 --umrsQkkrw7viUWFs Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl2DmFoACgkQJNaLcl1U h9Aukgf/Vv9cDAm7ZbWkhFeK1RH9SwZoPutCDECnVpkwDmhGQTF5USRjTqfipjgD jWPbrFlfj2NywPLcr3m3Kbv68oh9nG4hiR9BlMXeUXphR21F1s42lFs43ytqqNHP jg2RxrZQUTDvjDGjzj2Tw15K0k13fKfab7fsP8tmLL7gD1J/1+ZqC2PcfDezrJ6N /apUiyOfVTG295FxK0cPT+R1XK+MlxZFA4ZlE3orPloYAXYn68Zfg2fTqnfYD/xh 9e0l3vR5TgydO+RMP8hN/nYUqMTkCoFDrQcAa0dGMpWKku726UYQESFG22t4ptuW 4Kdhu90lals2zJkZvBe0BbRnXWv8RA== =7hvk -----END PGP SIGNATURE----- --umrsQkkrw7viUWFs--