[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20201215132305.5f5a1c2b@canb.auug.org.au>
Date:   Tue, 15 Dec 2020 13:23:05 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jakub Kicinski <kuba@...nel.org>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Roman Gushchin <guro@...com>,
        David Miller <davem@...emloft.net>,
        Daniel Borkmann <daniel@...earbox.net>,
        Alexei Starovoitov <ast@...nel.org>,
        Networking <netdev@...r.kernel.org>,
        Alex Shi <alex.shi@...ux.alibaba.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Shakeel Butt <shakeelb@...gle.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 bpf-next tree
Hi Jakub,
On Mon, 14 Dec 2020 18:06:29 -0800 Jakub Kicinski <kuba@...nel.org> wrote:
>
> AFAIU all we can do is tell Linus about the merge issue, and point 
> at Stephen's resolution.
This is the correct response.
-- 
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists
 
