From patchwork Thu Dec 10 02:11:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1413781 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=UO9+lKAg; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Cry9k5RmPz9sWC for ; Thu, 10 Dec 2020 13:12:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727911AbgLJCMI (ORCPT ); Wed, 9 Dec 2020 21:12:08 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:58859 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727779AbgLJCMI (ORCPT ); Wed, 9 Dec 2020 21:12:08 -0500 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 4Cry855jH0z9sW9; Thu, 10 Dec 2020 13:11:17 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1607566283; bh=/IR168j0DBvyZWk4UDeVSWrS9CAyzcVRu7l7dhi/4Gk=; h=Date:From:To:Cc:Subject:From; b=UO9+lKAgqZRYqKnFfB0JVvtPVBf7BTDI/rYki1NvF9huxp1mbXcrIsk3Xq9TDktGN L4r71anTSntJeRSsEZTJSqo5slTEuM9HWws69IiICpQJOA6hioO7D0diKBCNwJgWBz Xqmk46sIeT9uQpqMM2HAf34juhd6R+znwZWWeXN9I3c8fJXM1VEWYk+hzaYuFl2J4E gXplhIiyH06CPRS+BygFnyKi/h49V40FSjtFk/rT0vNu62BZPLzhvQy+NmmLfEylrd EDt4CXPCeLGyQfRQYtCLkVacCjFeOyo9qE9olOiDR+46EHsFxbP7SVIo3JZQXNahrP fYAnHMl1InCog== Date: Thu, 10 Dec 2020 13:11:13 +1100 From: Stephen Rothwell To: David Miller , Networking , Pablo Neira Ayuso , NetFilter Cc: Francis Laniel , Jakub Kicinski , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the net-next tree with the netfilter tree Message-ID: <20201210131113.6394fe45@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@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: 42f1c2712090 ("netfilter: nftables: comment indirect serialization of commit_mutex with rtnl_mutex") from the netfilter tree and commit: 872f69034194 ("treewide: rename nla_strlcpy to nla_strscpy.") 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 9a080767667b,a11bc8dcaa82..000000000000 --- a/net/netfilter/nf_tables_api.c