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;
Date:   Mon, 20 Jan 2020 12:40:51 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Al Viro <viro@ZenIV.linux.org.uk>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Aleksa Sarai <cyphar@cyphar.com>
Subject: Re: linux-next: manual merge of the block tree with the vfs tree
Message-ID: <20200120124051.2fdcfc61@canb.auug.org.au>
In-Reply-To: <f6ff3aa5-e08b-8b25-454a-9aa51b8b5c37@kernel.dk>
References: <20191220123614.5f11d2e3@canb.auug.org.au>
        <f6ff3aa5-e08b-8b25-454a-9aa51b8b5c37@kernel.dk>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/p3zfKWuJBbjhX_=7E_sj7Ry";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/p3zfKWuJBbjhX_=7E_sj7Ry
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Jens,

On Thu, 19 Dec 2019 22:34:59 -0700 Jens Axboe <axboe@kernel.dk> wrote:
>
> On 12/19/19 6:36 PM, Stephen Rothwell wrote:
> >=20
> > Today's linux-next merge of the block tree got a conflict in:
> >=20
> >   fs/open.c
> >=20
> > between commit:
> >=20
> >   0a51692d49ec ("open: introduce openat2(2) syscall")
> >=20
> > from the vfs tree and commit:
> >=20
> >   252270311374 ("fs: make build_open_flags() available internally")
> >=20
> > from the block tree.
> >=20
> > I fixed it up (see at end, plus the merge fix patch 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. =20
>=20
> Thanks Stephen, I may just pull in the vfs tree to avoid this conflict.

I looks like Al has rewritten the branch you merged from his tree and
caused various conflicts in my merge of the block tree today.  I used
Al's new versions of the conflicting files.

--=20
Cheers,
Stephen Rothwell

--Sig_/p3zfKWuJBbjhX_=7E_sj7Ry
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl4lBSMACgkQAVBC80lX
0GzF4wf/SWTPYajoG4wnwXpEnbOmNhKYTQQDgyMBxAzp/2DnLZkh7NzjXiH2MZ6S
q1Mm4zb7r2hR+TLI4YzrpvKKJSBiea/eeO8ANW7W7rJ+9n+Xxkn8u+ZFCMrEBoc0
kqIpfjszeZ2ABUqEeu3bP4DDzNtsMl5b01dhH4BgDGRbMJYFgvmDiOzzSqiCSJ9b
PJn1DMxRHwPPlKj+CkXkTBzqXxvvecHI25zZNctk/R2Q207tStumWY4bQQrpNEB5
ZyJrqtqqvUQUHVgiK4CXIy6R2lPRR8tpIqJ4kjuDtVeMuyph3Tv3DcQr5/GOIYJ1
Fmp5Qw+Pwd5n+4BElQmwEOW3afmAcQ==
=5GwO
-----END PGP SIGNATURE-----

--Sig_/p3zfKWuJBbjhX_=7E_sj7Ry--