From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <netdev-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id D9E18C433F5
	for <netdev@archiver.kernel.org>; Fri, 20 May 2022 13:52:41 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1350010AbiETNwi (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Fri, 20 May 2022 09:52:38 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55780 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1350000AbiETNwh (ORCPT
        <rfc822;netdev@vger.kernel.org>); Fri, 20 May 2022 09:52:37 -0400
Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207])
        by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0211B5E75A;
        Fri, 20 May 2022 06:52:35 -0700 (PDT)
Date:   Fri, 20 May 2022 15:52:32 +0200
From:   Pablo Neira Ayuso <pablo@netfilter.org>
To:     Felix Fietkau <nbd@nbd.name>
Cc:     Jakub Kicinski <kuba@kernel.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        Lorenzo Bianconi <lorenzo@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the net-next tree
Message-ID: <YoedILM+WeNaOXxt@salvia>
References: <20220520145957.1ec50e44@canb.auug.org.au>
 <20220519222044.1106dbd7@kernel.org>
 <YodFzAu0gSSMdJIz@salvia>
 <39b34170-cf98-72fc-881f-ce0e42573f66@nbd.name>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <39b34170-cf98-72fc-881f-ce0e42573f66@nbd.name>
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: netdev@vger.kernel.org

On Fri, May 20, 2022 at 03:49:36PM +0200, Felix Fietkau wrote:
> 
> On 20.05.22 09:39, Pablo Neira Ayuso wrote:
> > On Thu, May 19, 2022 at 10:20:44PM -0700, Jakub Kicinski wrote:
> > > On Fri, 20 May 2022 14:59:57 +1000 Stephen Rothwell wrote:
> > > > Hi all,
> > > > > After merging the net-next tree, today's linux-next build
> > > (x86_64
> > > > allmodconfig) failed like this:
> > > 
> > > FWIW just merged the fix, if you pull again you'll get this and a fix
> > > for the netfilter warning about ctnetlink_dump_one_entry().
> > 
> > Thanks.
> > 
> > Felix forgot to include the update for the mtk driver in his batch it
> > seems.
>
> I didn't forget. It was in the series I posted for -next but I had to remove
> it to rebase the patch onto nf (as requested by you).
> The affected code didn't exist in nf.git.

Next time better if all the patches are handled through the same tree.