From patchwork Thu Jun 24 01:58:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12340667 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15AD1C48BC2 for ; Thu, 24 Jun 2021 01:58:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EF55961351 for ; Thu, 24 Jun 2021 01:58:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229924AbhFXCAz (ORCPT ); Wed, 23 Jun 2021 22:00:55 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:32849 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229812AbhFXCAy (ORCPT ); Wed, 23 Jun 2021 22:00:54 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4G9NZy0B8nz9sX1; Thu, 24 Jun 2021 11:58:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1624499914; bh=TtVONHpBgW64sQti2v2KVngpO3bGOmdSaV6jJxzKf9U=; h=Date:From:To:Cc:Subject:From; b=VuYiF38/+zagiyIkOEMHCRgEr7fV8qgjGYE9VAnGlykMSonlALhy782hN3QrI2UUd yfbzd+s5nEXlOOVgQ/EaUpD2NLLODKd0lk/++rmY7E57bRMZ394d8iMcRDZEpZ4YRx dGw4YUJFw7XnqG1B4/hPGBiLIzHgq7z12Unzw9VWfnRF3e+L7dmEbIXlk+sCWaneuJ wTpoTsEMyMt0tzroObiyHZuwAiMB1Ey88r/VRqQ5JRgP7OCpdlmRUNKgOmFH9uLlDV hOacwF1bcUCXzrFsPfFfi3asBuQ4oSKjYfsf76ubYtPhFcieL/xdGeMRi7z+LvgJ/G 1oKF4oa/e07/w== Date: Thu, 24 Jun 2021 11:58:30 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux Kernel Mailing List , Linux Next Mailing List , Pablo Neira Ayuso Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20210624115830.606b35c8@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/netfilter/nf_tables_api.c between commit: 3c5e44622011 ("netfilter: nf_tables: memleak in hw offload abort path") from the net tree and commit: ef4b65e53cc7 ("netfilter: nfnetlink: add struct nfgenmsg to struct nfnl_info and use it") from the net-next tree. I fixed it up (see 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. diff --cc net/netfilter/nf_tables_api.c index fcb15b8904e8,d6214242fe7f..000000000000 --- a/net/netfilter/nf_tables_api.c