From patchwork Thu Apr 8 03:11:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12189887 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=ham 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 18C7BC433B4 for ; Thu, 8 Apr 2021 03:11:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D686861175 for ; Thu, 8 Apr 2021 03:11:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229734AbhDHDLd (ORCPT ); Wed, 7 Apr 2021 23:11:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229510AbhDHDLc (ORCPT ); Wed, 7 Apr 2021 23:11:32 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3636C061760; Wed, 7 Apr 2021 20:11:21 -0700 (PDT) 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 4FG5rR0XTcz9sVt; Thu, 8 Apr 2021 13:11:18 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1617851479; bh=XRZd5e7aM4sYuw8uXFm5nELypDN8Dj4CBomZlTo5WBQ=; h=Date:From:To:Cc:Subject:From; b=umdV4Dt0iJQwP9m+JF3U7IByKWWUiAQlqSlq3OhvMeRnXMnTbqWLP0T7tBBsQwADS BcP3tDn7p8kKCNnOBaRRwMxYp40CzlakMURDXC+7rKfD5vU0GEA9isKIJkMMwOi6rZ /AK7kFlmBMT3aMAdr6swzaKB8htFRpP+IEfpVaHdWeaPh7Zd/PHJHvdu/9tmDSs8me Ma8dmtg9pgVjPoI14EqaeknYpVEAv5ZWAzJt3ocnfuIHzTKrKG61eTQ3LBTB8QLSDC KwdONqukPHmGY3tTWROm+/FRVWXj+1EuL6MVR/WTFbkDWP2hSMWzIbTwXXw9lAq+EH UG5GcSNPCQJRQ== Date: Thu, 8 Apr 2021 13:11:17 +1000 From: Stephen Rothwell To: David Miller , Daniel Borkmann , Alexei Starovoitov , Networking Cc: Cong Wang , John Fastabend , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the net-next tree with the bpf tree Message-ID: <20210408131117.7f2f3a29@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/core/skmsg.c between commit: 144748eb0c44 ("bpf, sockmap: Fix incorrect fwd_alloc accounting") from the bpf tree and commit: e3526bb92a20 ("skmsg: Move sk_redir from TCP_SKB_CB to skb") from the net-next tree. I fixed it up (I think - 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/core/skmsg.c index 5def3a2e85be,92a83c02562a..000000000000 --- a/net/core/skmsg.c