Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3187447imu; Sun, 9 Dec 2018 19:45:48 -0800 (PST) X-Google-Smtp-Source: AFSGD/VofvQs2ZSYVyA2ETLyrhk54BNK9bgZ+R2VF4iwRskYeGga2C3GvWcJ1PgVCXByKl+z26tU X-Received: by 2002:a62:c583:: with SMTP id j125mr10995705pfg.37.1544413547981; Sun, 09 Dec 2018 19:45:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544413547; cv=none; d=google.com; s=arc-20160816; b=f013wWWdtQqqEXKfJGVelFjDY8uaU7VqB/6jpf0vTmgGlMee3NaK+N79PyDfmiQI/v YKPbrwwXIKkKwZvHn9kVc1jy4lkMo+LTVyVj2BJh33gl457yYcgQvJOlN8t93Nsq3zSU CMG1glSGZHpLjxX5h+uy9b3OvBD6AS8QzXcEZc1HsDLBac1kcSkoj2OVoeioAOhI0mjW HY00/z0fLWgpvLr628z4ehu0yRv8P5NxYBOEGd3+SxZe1ZwADle/BiM5NcZlyV7LvyAQ GgygEiOSyl/JWd/P2JTaw5K/K227tV9hsriTgN7fT6yTI3tof9Fqzsfy0Uw1Pic5bO12 WMwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:subject:cc:to :from:date:dkim-signature; bh=iNrKJGRoZ0mz6KyTNx8BmR+7l7LkbQhE3agRCy+TpdU=; b=GZ/LMGMJ3w8MnFkoK+GDfXg/MwaDwnb4Rbrtu8MnJEBgOXRy8Kfzd1dPv6QkszG0RS Ah7M6jCWCg2OH0bPzNZgaff6u4HEqdE/mmfS9U7QnRFoHY9DsbpFaPiunI9uY2H+j7xB d3PAJVN93jO8Nvfy3Q5hI3dr1qXjby7XDyd7+063rdlxCu6Ci6CNY/cfzfRV6WC3sQOd zy4kMAJdZeeZo+bU34uxS0GfrkY7g9ejoRcIoCLzfgYRsJ6mXz+qpje5DmiolxV8n9eS zS7696+icjr9d2oahWgdeMq1hDmm7uDoxtehYeOcHh6vzpcl+jP1vvkGGH/j3cM4ZEiZ 6J4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=L8SeP0js; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n3si8806053pfn.285.2018.12.09.19.45.02; Sun, 09 Dec 2018 19:45:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=L8SeP0js; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726275AbeLJDn0 (ORCPT + 99 others); Sun, 9 Dec 2018 22:43:26 -0500 Received: from ozlabs.org ([203.11.71.1]:36725 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726098AbeLJDn0 (ORCPT ); Sun, 9 Dec 2018 22:43:26 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 43Cpnl3qldz9s2P; Mon, 10 Dec 2018 14:43:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1544413403; bh=YXGWnNErFgdigwDAg5TtcRSnEcnVzN1UmooQRnpLhtc=; h=Date:From:To:Cc:Subject:From; b=L8SeP0jse2pgNXxMpECui5B1IcAYWg78zkyVOkdF49KtuvV+1UmvacJdX8t4leHt9 iqE/pW7cZTfukiL9XwRRwUhFTtNStMddSv93KZMny/X3Uc4mQddkIUi1wqTWbJNFy7 MuX08veqqoBmhHi+ac5wRXS6U1ZrIt8JzzeKIu2Ui11mjSRIfuQ4SrwooDn8SIY7ZL WdOYazDf9/fTGG75ppS9uZ4CV3GVhnoOUc1XPShb+UqFeHFG3n98He7u6Cq/Tq9Bzh Cd61Iv8xKpguM6+JVjtbfA265C4AEKWTXyLyUSokULVb9EkqMdjC/SKldsX16Thodk 7nX3FlG8zQDoQ== Date: Mon, 10 Dec 2018 14:43:22 +1100 From: Stephen Rothwell To: Alasdair G Kergon , Mike Snitzer , Jens Axboe Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the device-mapper tree with the block tree Message-ID: <20181210144322.11a94d25@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/q1Kzo215pGJ.Yz=WAKt/TmG"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/q1Kzo215pGJ.Yz=WAKt/TmG Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, It appears that there are a series of shared patches between the block and device-mapper trees that are not the same commits. I assume that the block tree has been rebased, while the device mapper tree that was based (or includes) part of the block tree has not bee rebased (yet). --=20 Cheers, Stephen Rothwell --Sig_/q1Kzo215pGJ.Yz=WAKt/TmG Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlwN4NoACgkQAVBC80lX 0GzgFQf/Z2uhvvJPpOXS8XrLFxX1pyCbkodorwcp5uWcu75NJjCBPIF14IJgJnAy 5MDfbhriOEW5ofrzWsjUSIOyXusWNZv1nfIRP1cMVOb4x8ijDaV3I1BpKojRHmCz IlbiRk37UrK6NGjBHjZB6M5C10Q/H4VbRFYT8WxZe70xzhwyRHjLRSYrAe+tqTcQ Yb0UBsEQ4gMryFgah63xCOVDb6n6XwyyFu88S5Jv/WptZo6qaEvCAoFNE0CRMOy8 4B627C2z1EKq8sExN06CByiCRMCKaVvb79nhf8KuORGDGQZsry6eoHFMHjoLNZWj fF8MT4TWXgmECMz3hRdtXlZ/BX3VWg== =l2pd -----END PGP SIGNATURE----- --Sig_/q1Kzo215pGJ.Yz=WAKt/TmG--