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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F25CC433F5 for ; Tue, 15 Mar 2022 08:18:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345807AbiCOITp (ORCPT ); Tue, 15 Mar 2022 04:19:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233581AbiCOITo (ORCPT ); Tue, 15 Mar 2022 04:19:44 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B4A021E0B; Tue, 15 Mar 2022 01:18:33 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4KHmWX0SBPz4xRB; Tue, 15 Mar 2022 19:18:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1647332312; bh=5ICCz9wKBm9SoxKDEUmabQKMoUixurM77xqto89egKs=; h=Date:From:To:Cc:Subject:From; b=UhtrCKqc5tG6BbLAl4IIMHzseXy7doqa1V7UATtT1ypUZH0yOjthHMVP1YidwjUbh Ew+IDwyw71xdL+Ng0+QrvUhGODQjlHy56HPJ/YcbOwcLFOX6qMdsoyJMfB+ZzxZgEs 2v6nnvdkWm0d3ALAfnRT5UpHLwk+IelXjS8hcQa6EyeGaSuiguepYCOg36Dnsr/5i5 B9bTRwPIKinha9u2wy7NcFZOIe4LgSBn3JmE0t8mEkR/M/JbscjhgbSiPBAzLxBjep ACBv3NL1SMAuW3lSkJTA0BwJZsydnoPsHAT7mpU5+i5SErtPV7in68eLAJ5zKMx1Il XgQ/1MrJaTUIA== Date: Tue, 15 Mar 2022 19:18:31 +1100 From: Stephen Rothwell To: Dan Williams , Jens Axboe Cc: Christoph Hellwig , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the nvdimm tree with the block tree Message-ID: <20220315191831.15816703@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/+YpPqtsz2mNdob/CxgQDzEc"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/+YpPqtsz2mNdob/CxgQDzEc Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the nvdimm tree got a conflict in: drivers/nvdimm/blk.c between commits: 322cbb50de71 ("block: remove genhd.h") 20072ec82864 ("nvdimm-blk: use bvec_kmap_local in nd_blk_rw_integrity") from the block tree and commit: f8669f1d6a86 ("nvdimm/blk: Delete the block-aperture window driver") from the nvdimm tree. I fixed it up (I removed the file) 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. --=20 Cheers, Stephen Rothwell --Sig_/+YpPqtsz2mNdob/CxgQDzEc Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmIwS9cACgkQAVBC80lX 0Gx+SAf+NdvqLE8f0esRN2fwG268MuL+lHSMsolQ4dvkEdmalXqdhyUXiv2BP7Lc MWgSQ9uc0KaS5BNUSC1jrX4GhUSauJ1UHGo7C9jKRjZwiY77Yu5IbQeHTj+3JUpy lb8W5/6/GnBOmVdYdKiqpQJhqh5K9Xi66LHwDl/iR7E/XjSv+5KvR1fLyw5uY8vY NV5SoNU49D3uQI79sDgtehDKVJZrBeZ4L4j6cFZt9NCtTRfIqPv0v1f9xl4+/3U5 hmy7Dy2n2r2/IdnBl84ziQ9Kl/0Ax5k7NvRWvBR5E6copkZtxB282rXNKMlYouB5 Vm5CFJEEa3Fl1nnS2GZvkB8zaCbhSw== =2hLJ -----END PGP SIGNATURE----- --Sig_/+YpPqtsz2mNdob/CxgQDzEc--