From patchwork Thu Oct 27 00:07:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11506 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp557530wru; Wed, 26 Oct 2022 17:27:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6+81kSH9eSjZyTE+aEiL9Aoxrif9izkpyojHVOLRbUNXvMU49Wz5q70jKmab/u1MQSPAUo X-Received: by 2002:a17:906:7952:b0:787:a14d:65a7 with SMTP id l18-20020a170906795200b00787a14d65a7mr40083842ejo.108.1666830437221; Wed, 26 Oct 2022 17:27:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666830437; cv=none; d=google.com; s=arc-20160816; b=ghGjfCMGAFKwefd9N5CkoeGuFFw1mMW4f06CtZb+2QmjoaoyZ3dG4515sIq+YU3t3P PboaS13E8hc5jKjTQlWAhjZsbxG/o7U8SdMz35hhoVWuBVN01Oqk7kYPNEbXJUr9NP2y SP2af7gaY5IWsn5Q/MqRqhM2S2CjsIzjXE8vPZE9BNgwI8SHKmqw/8sWYT3ypAgJpA7C uGVVQrp4ta8WyeNWTYqcm+GKuss2TOWQgWRaRp3zPXhy96azRKZvspx8pmGicGRrYDPI m5SSEBx6VtpDtkk9S5Fw9tGBGE4MeFcYCNVnqX34ocUXlVzfHU3cNOV9BIS8HZ8WOcRd 3kTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=4QLpjDwz9lbeON7XUEXcSe5KN/9yirIHZlEgdXPZBD8=; b=qCznKdPvhQCpndQ3Lhxyeh2+WDZFEsj591GWmQfsGk5jGwjAFL7bI+hea+Y54/eSWW Do5dRrs6VT94OB1Ct6HT4AJpaqbMQbDULjw6mWzQUC3/Xsx/kOtt5fnXaDLvFe34DFWC K8eOIp0or6efoK/vwOTCri7NALuhmFwXU7v6pIbgCJVrma1T66OSrmJoRI20sKQx/Zx6 loPd+G/SFxtabFscUI0lLFAKpKkh0OFLqiy898lWQTEK1J/JoeygIA9b6IxWHhI1xDhp B3J558smvMAbrBsMVbcbRWHQsGqZs0pPy93QIePoQiD8bnKdyI2BJ5gaU4nEvwFQ6q+c Coiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=EgNJ8Gpf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v22-20020a056402349600b004488842d88esi76817edc.13.2022.10.26.17.26.38; Wed, 26 Oct 2022 17:27:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=EgNJ8Gpf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233826AbiJ0AHL (ORCPT + 99 others); Wed, 26 Oct 2022 20:07:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233561AbiJ0AHK (ORCPT ); Wed, 26 Oct 2022 20:07:10 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17BEB56B82; Wed, 26 Oct 2022 17:07:07 -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 4MyQw55XbCz4x1V; Thu, 27 Oct 2022 11:07:01 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1666829223; bh=4QLpjDwz9lbeON7XUEXcSe5KN/9yirIHZlEgdXPZBD8=; h=Date:From:To:Cc:Subject:From; b=EgNJ8GpfX1rKI52H2eFRT4bGosFA3zxRujm3ps+HCtB1yQkMFG+7+OAt/Cx4xma9m IMnSAWo0khEKCc7ufsvBbDi/jeWY0U7oOTtoDV/0mTiTyTaXgzwCDqqo/IHyxgtxbl RLpKEnwSGY/fLtiY6HgpW9Uaeh0gsporRZ0f0FMhUkZJ2VSpq6hf8gJAypW+gJmaW7 fRK4S/XCH3PHlVtYvHeONZCxj1OPWZG/ZfBEP69aEB4LEfK5zCjD0kYiGb3NEFnSgp 64d5g7o8Rsj6WEM82T9pgH2X/7YtX/hYzpLss4YRYx3f0Mo1YUCKBVMegyGik4KhW2 1izZzaWfqBApA== Date: Thu, 27 Oct 2022 11:07:00 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko Cc: bpf , Networking , Linux Kernel Mailing List , Linux Next Mailing List , Martin KaFai Lau Subject: linux-next: manual merge of the tip tree with the bpf-next tree Message-ID: <20221027110700.110214a9@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747798392436118535?= X-GMAIL-MSGID: =?utf-8?q?1747798392436118535?= Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/net/bpf_jit_comp.c between commit: 271de525e1d7 ("bpf: Remove prog->active check for bpf_lsm and bpf_iter") from the bpf-next tree and commit: b2e9dfe54be4 ("x86/bpf: Emit call depth accounting if required") from the tip 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 arch/x86/net/bpf_jit_comp.c index cec5195602bc,f46b62029d91..000000000000 --- a/arch/x86/net/bpf_jit_comp.c