From patchwork Wed Oct 18 01:30:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 154611 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4502531vqb; Tue, 17 Oct 2023 18:30:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEON75D0IZ2e1fk9E2c16+A+Do9eFPKdP3c8bGF0MbD5TTS4I3oJgNGz2XXfFrOCO4N0BCc X-Received: by 2002:a17:90b:3802:b0:27c:f653:37b2 with SMTP id mq2-20020a17090b380200b0027cf65337b2mr4228848pjb.1.1697592647676; Tue, 17 Oct 2023 18:30:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697592647; cv=none; d=google.com; s=arc-20160816; b=CYPNQRhxQs/VJ5zIZakqIy6KymUCxQ8YNnY6X6cDHeDEP2Q7hA9cj9+4AHpqptL+pX /BX1fAO8pjei+422+p74/tGKWLuhXJ3sgX8n+UK7ea5QUXCrnFrhB2GfHaB60OfVGwu5 iGK7LbjfbF+DwMWkpseHQYxA7X4ebTro+0iB5R4/VQLMW138Vq9s5LMpJoqEP+BixjBF BKta461J8oYfrshYOs+saowNntzaBoj37HIUk3cpPcdp5ygFpe36MMHqRy4Fcg9sp1Xw U3B6uxJH+FHcsyMOMSW7uYMIp9PFBdOVBKGaxx6oWxAbe7oRNlcxjSiMGJyUxbdOWhnH 1AbQ== 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=MoQnsNEinM8NYDsh5Ogyks6w9xDCU0Mj2oDOrkzM4/Q=; fh=qgaD5edGCjNyOoLtPbfuYTHW3TKFYp3nVpmYv5PpxgE=; b=Tj3o33cL4ZuANENET8xKdoEO/LkEB/1agHto0ZbCKwvTlJR4TlZl+gzL6mauQAJQxp RfxXHXWUzpNlBFxBReAYT8Rc9oH2gk5/XJWXHc0NK+ltgO+WReALrn3AXp7zlLISBgdZ eIDIF86vpVIX62tCR9fO3MuJOOfxEUW+O9ds8C1fEXYB1MRzpshub5WMXRHYqdh9+5MZ PkPVfRV7sSLOL1w4oBD1PMPkO7fLgtCbq13c/kQPzVDiDU2ZXLx8WdV9CPyOnuXyVYw5 WE44DiOZgc9QVduDxID9aswazI9HtKUohpM6jsRljuplnNJnBrr2byBhCfkrEjfHV1nk xQag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Rk1TCxRc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id r12-20020a17090aa08c00b0025eeb3cc4b2si379321pjp.9.2023.10.17.18.30.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 18:30:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Rk1TCxRc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 13A1E8087524; Tue, 17 Oct 2023 18:30:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344329AbjJRBaZ (ORCPT + 23 others); Tue, 17 Oct 2023 21:30:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229458AbjJRBaW (ORCPT ); Tue, 17 Oct 2023 21:30:22 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86B14B6; Tue, 17 Oct 2023 18:30:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1697592616; bh=MoQnsNEinM8NYDsh5Ogyks6w9xDCU0Mj2oDOrkzM4/Q=; h=Date:From:To:Cc:Subject:From; b=Rk1TCxRc8zpUHvRA3pG9BG9pYC9kniwLq35rklMzDlTekiLG/XAcKBjOK9fOu5Kzd OUpqtPKvKeuXhuI6Sz7XJMLZ0uS9GPMzddXiFEwjhnTeX8Zgj/M7X24weuq2SoGv2S y0zj971puTYt9gpylaxowyA0dtrDWvR2tPNem9P4YkCRZTLOanPl5lXJVHQ042l4A7 CQlXW38bQ+JEXw88c8oJyvqiBn4RmDDyEgjvSR0HFrvg/3WUeNtMwLNpMXH46kAs5G sGAc+e3zhmpBrDaZLnVKmk4/ftIk7bAs+T52teLuD0EEQJ1xWq1CTmibKxgKpQcEMv 2f+L5KzxVfHqA== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S9Cvr0bbpz4xM1; Wed, 18 Oct 2023 12:30:15 +1100 (AEDT) Date: Wed, 18 Oct 2023 12:30:14 +1100 From: Stephen Rothwell To: Steven Rostedt , Masami Hiramatsu , Shuah Khan Cc: Beau Belgrave , Linux Kernel Mailing List , Linux Next Mailing List , Shuah Khan Subject: linux-next: manual merge of the ftrace tree with the kselftest-fixes tree Message-ID: <20231018123014.65073211@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Tue, 17 Oct 2023 18:30:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780054908021790132 X-GMAIL-MSGID: 1780054908021790132 Hi all, Today's linux-next merge of the ftrace tree got a conflict in: tools/testing/selftests/user_events/abi_test.c between commit: cf5a103c98a6 ("selftests/user_events: Fix abi_test for BE archs") from the kselftest-fixes tree and commit: cf74c59c4fc1 ("selftests/user_events: Test persist flag cases") from the ftrace 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 tools/testing/selftests/user_events/abi_test.c index f5575ef2007c,3d539e556dcd..000000000000 --- a/tools/testing/selftests/user_events/abi_test.c