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=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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 3D4C6C282DD for ; Wed, 8 Jan 2020 22:14:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3677206DA for ; Wed, 8 Jan 2020 22:14:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="DLgkLFEk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726390AbgAHWOz (ORCPT ); Wed, 8 Jan 2020 17:14:55 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:57509 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726179AbgAHWOz (ORCPT ); Wed, 8 Jan 2020 17:14:55 -0500 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 47tNpN0DpTz9sPK; Thu, 9 Jan 2020 09:14:51 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1578521692; bh=LUg4U1DK+Uedq+MbLvO7g0l+TyKvlMI2N0DwLT+I9ko=; h=Date:From:To:Cc:Subject:From; b=DLgkLFEkCc75WSkFuLhgCsadqtPquDBxR3zv9dwtffT35jDZAHbdRO+998TYhLEOX bAHfvn+h+yUVjEVRBxmgtmOI0XpGm7WaJbvsGPSFUslPiwySzH+yiwv3tCwGCfLFeT JjMkfNangTZ52EzDrkuStLXh118thKXb7XMzaGLvF/rOxvF3heFsmlxOF+JM8t6qge cuR3SBYAOr2z2egbJRqARxJcmkq+LdYxdo4rYCCaobiedEk6EOs1qy3h3bASSM4TvW eS1fMh77l5qJ9DIUfSkD4v1wocGstYmEI9TvBrzfDNcJHjs9F6UOThUYSAGvOOzwTV b5mSyLajuL0+w== Date: Thu, 9 Jan 2020 09:14:45 +1100 From: Stephen Rothwell To: David Sterba Cc: Linux Next Mailing List , Linux Kernel Mailing List , Josef Bacik Subject: linux-next: manual merge of the btrfs tree with the btrfs-fixes tree Message-ID: <20200109091445.48b9ec2f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/SVo4Pf59N5eq0KyYlby0BzA"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/SVo4Pf59N5eq0KyYlby0BzA Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the btrfs tree got a conflict in: fs/btrfs/inode.c between commit: 045d3967b692 ("btrfs: rework arguments of btrfs_unlink_subvol") from the btrfs-fixes tree and commit: f8b3030e0807 ("btrfs: rework arguments of btrfs_unlink_subvol") from the btrfs tree. I fixed it up (just different version of the same patch - I used the former) 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_/SVo4Pf59N5eq0KyYlby0BzA Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl4WVFUACgkQAVBC80lX 0Gz7EAf/T0whbUeRFqGRgtXxd7rDYmVxU8INeR8w8lCBPuOPxnt+W4boIObaRQEo 0/egJLMo5S4upJJJKd0o//Jg/eZEVCZmFvFVVV5ZT/kSkrhs3PLGpeXCdMi2Iy1H e5mjpKdbE5Xdt7R7Uftu40ZR9ExoxnQ3OmZxfRSyhlzk13Vdh7t67RB20+ZZr7ve VcwOXN2LnMiKL6bOei7wpAjtn973kvtpT8qDdzfhFXah1VBsWReoF92lRPmCBxYa RADippVnsdgWD3SV3otfWKsE9CdGIiRKuK868IoIL6FbF6/yb+XOp786PIYZxgVm phAI8QMRyAgk7A1qUQecP5Fhg1iJKg== =3QlM -----END PGP SIGNATURE----- --Sig_/SVo4Pf59N5eq0KyYlby0BzA--