Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 1 May 2020 10:28:25 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Sterba <dsterba@suse.cz>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Filipe Manana <fdmanana@suse.com>
Subject: linux-next: manual merge of the btrfs tree with the btrfs-fixes
 tree
Message-ID: <20200501102825.431f9cac@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/u+WjmABmJRStqA62JTl0CIv";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/u+WjmABmJRStqA62JTl0CIv
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/tree-log.c

between commit:

  f135cea30de5 ("btrfs: fix partial loss of prealloc extent past i_size aft=
er fsync")

from the btrfs-fixes tree and commit:

  e94d318f12cd ("btrfs: fix partial loss of prealloc extent past i_size aft=
er fsync")

from the btrfs tree.

I fixed it up (I just used the latter) 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_/u+WjmABmJRStqA62JTl0CIv
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl6rbSkACgkQAVBC80lX
0GyTgAf+JGsYlNfIbv5Ya85HB01TEp8GDkHTonserEV+GRkJeJAfBJM8k8mm8dF2
RJv1Gx+P+XsywSaDTPX1ofZvkBbHyrtehudrw4+Hl6C9CzYujnYs8qWWyR87sS9i
O2FkxnyK/EsZWpZl231o0gE7niaHJKI2uwZbcb9DLeyeFMjQXoXr87SoCLwuTCxW
G5AggvrFxOWqt+0/mJKFhIubW3LY6GWJRikMNWpw6knJouoiRQxCegSToGSEjfVl
Wt0ZOEhgx8mTOPcRWDqrqSUk6ePIbq13Uh0DkAvCq3ffDIEvIQ8UwQRkHrIuF8sh
6E3rdonbhq0E3aGa4YT/sMSA0qNdNw==
=IaXQ
-----END PGP SIGNATURE-----

--Sig_/u+WjmABmJRStqA62JTl0CIv--