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:   Wed, 29 Apr 2020 18:24:06 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christoph Hellwig <hch@lst.de>
Cc:     Alexei Starovoitov <alexei.starovoitov@gmail.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        Networking <netdev@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Al Viro <viro@zeniv.linux.org.uk>,
        Xiaoming Ni <nixiaoming@huawei.com>,
        "Guilherme G. Piccoli" <gpiccoli@canonical.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 bpf-next tree
Message-ID: <20200429182406.67582a6a@canb.auug.org.au>
In-Reply-To: <20200429065404.GA32139@lst.de>
References: <20200429164507.35ac444b@canb.auug.org.au>
        <20200429064702.GA31928@lst.de>
        <CAADnVQJWLPpt6tEGo=KkLBaHLpwZFLBfZX7UB4Z6+hMf6g220w@mail.gmail.com>
        <20200429065404.GA32139@lst.de>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/W8DO522oYpzojNSk.1B7cDm";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/W8DO522oYpzojNSk.1B7cDm
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Christoph,

On Wed, 29 Apr 2020 08:54:04 +0200 Christoph Hellwig <hch@lst.de> wrote:
>
> On Tue, Apr 28, 2020 at 11:49:34PM -0700, Alexei Starovoitov wrote:
> > On Tue, Apr 28, 2020 at 11:47 PM Christoph Hellwig <hch@lst.de> wrote: =
=20
> > >
> > > On Wed, Apr 29, 2020 at 04:45:07PM +1000, Stephen Rothwell wrote: =20
> > > >
> > > > Today's linux-next merge of the akpm-current tree got a conflict in:
> > > >
> > > >   kernel/sysctl.c
> > > >
> > > > between commit:
> > > >
> > > >   f461d2dcd511 ("sysctl: avoid forward declarations")
> > > >
> > > > from the bpf-next tree and commits: =20
> > >
> > > Hmm, the above should have gone in through Al.. =20
> >=20
> > Al pushed them into vfs tree and we pulled that tag into bpf-next. =20
>=20
> Ok.  And Stephen pulled your tree first.

No, it is not in the branch I fetch from Al yet.

--=20
Cheers,
Stephen Rothwell

--Sig_/W8DO522oYpzojNSk.1B7cDm
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl6pOaYACgkQAVBC80lX
0GyfPgf5AfDRR+uaAmpYyPjYWiIziyaXRfGhaZxYrS0542Jel2ojgZZlJOPKqEYJ
UGHZgKYR8CYrHZzQg8/4+oSPk0qGhFz5tg8BjCQpaqTMTDSKeZ9WraDohke4CoJf
8TyBurjmVASZqwiVBAJJSvIYyszdUmK1D1XzeZ7qb9snSADRKDT8wKkeSRzwdL8a
MVRCdXbkXyI6jlBvqocsPe13WNaHMgNk/7iXRfpkoEclxylotRwhH7iBrl100pgw
SkBQOKW1R8RQBAZDjPqXPAqIBYPzENFecb4NKKjWNsFEQ6dkqnz0dcjwEkCGLr3w
ItdEZpCS//knWCcZnw1cc68FbPgEXw==
=U/RL
-----END PGP SIGNATURE-----

--Sig_/W8DO522oYpzojNSk.1B7cDm--