From patchwork Mon Apr 17 12:20:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 84212 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2102903vqo; Mon, 17 Apr 2023 05:57:34 -0700 (PDT) X-Google-Smtp-Source: AKy350aSsx3a412MG84dGZqYVLLAhOY0qvDt90lNNWVbkWc7PKz4CBSPjVdMa+UaC++r9Zc+cEFa X-Received: by 2002:a17:903:11d0:b0:1a6:9671:253e with SMTP id q16-20020a17090311d000b001a69671253emr15232149plh.47.1681736254464; Mon, 17 Apr 2023 05:57:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681736254; cv=none; d=google.com; s=arc-20160816; b=a4g8YCXs3W8eZHnzAT5ek+pViEQeqZB5WgEQa8CemfeY5/37zLLSPVyQjKOP65E45F 3FikRN1iZ2t5ZtaKoq4d7SsK+1qnDmYDCVE1TBeaIH17hCVmH3XAGa+nXO/cr4wpQcu9 efZj3EL22ncSB7cHcB1HrR3Pv3cH470zMe2g2p5PHQ/IRL94qqFt3nNePkQuD/ORowP8 ZLqO0eGYzaNzm4TyTCelUKr9HHLHxVlUVKU1WT2n+1kwlkHdlgyRZGZuT9rTOqcTlfIZ cZClE0AE/MUdD5+2vom2FEH8XYfUfpmqw5dFKPrkhhLIoSFxYL6X2avMPf7lROzGqnd1 5ErA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Wyxb4YsUHp4BxkcVRepTcw6STay6/OHUwQIPFoB9qBQ=; b=SG4vNk6noXWo5HH82yQ8qjZlS7H0WfjzDUxkRt5a3jgiLul9A67CcdYl5RESm3M/hz CLSCxbLrKpErP8JaQC73GXUXzjVkhUfE1HnM0jqBxMdr/EaofS8t6s58oMZvPFjsBa5B dOtQep7MWBprqPvSY1qzwqsJl9YAlRVV7PqllCMhKnLnOkDA/80lCVJowQEoDjrjL3ts Ch4NYA/DOvxmWOYsrbc46Hdk919J6eq5Y6tIcAi3Db3Q/IHGYmIoxu0CVABeOLBw4dcv /TbYEWfDuton45rk+b8/LofI18Xl2QzofXZ0NixR1wovu5MnstYQS9C+ObLNUc5NbVyB hfqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bJYof9iT; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s14-20020a170902a50e00b001a639f7eb37si285075plq.14.2023.04.17.05.57.22; Mon, 17 Apr 2023 05:57:34 -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=@kernel.org header.s=k20201202 header.b=bJYof9iT; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229461AbjDQMWQ (ORCPT + 99 others); Mon, 17 Apr 2023 08:22:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231163AbjDQMVu (ORCPT ); Mon, 17 Apr 2023 08:21:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4593D9746; Mon, 17 Apr 2023 05:21:09 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8429D62343; Mon, 17 Apr 2023 12:21:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D856C433EF; Mon, 17 Apr 2023 12:21:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681734067; bh=v6GeTyqbTX2Q85J3eve/ZjdwGEtZ70QLU5PDsHNjMNM=; h=From:To:Cc:Subject:Date:From; b=bJYof9iTHwmCBFCQvVtPDNrilh2yIbNrxB1SSz9ksP+sOCFflxdtqGSXbA51mX8hm oFeLbNee+xgqt6XD+4NvzhuW/kHMzmUqZGBvCWB311Ajk/fP3ovWe3ObsAiZfTFbJP z/Vy3nqSYw9Lggn8lK9Qc5IH/o2HjcBnGGI1G303oBs5cn+HD+YvGFbupyqGiZj/Vc 53zSnWiZpTH26bwIriIrE+YGE/d5afCfELzMp+c/ZBkAAw4DpMQ1Cah7k8dlv5vpHJ UsfptrPMHl/rcXA0/abFh1TzksFBizZfagPPWnJG3/n3+4p5Dl6gu27XuCAllvkwWj 3TmXkSJ49zw7Q== From: broonie@kernel.org To: John Paul Adrian Glaubitz Cc: Andrew Morton , Linux Kernel Mailing List , Linux Next Mailing List , Peter Xu , Randy Dunlap Subject: linux-next: manual merge of the sh tree with the mm-unstable tree Date: Mon, 17 Apr 2023 13:20:55 +0100 Message-Id: <20230417122056.244444-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1763428274543639142?= X-GMAIL-MSGID: =?utf-8?q?1763428274543639142?= Hi all, Today's linux-next merge of the sh tree got a conflict in: tools/testing/selftests/mm/Makefile between commit: aaf87fd8703a5 ("selftests/mm: use TEST_GEN_PROGS where proper") from the mm-unstable tree and commit: 644a9cf0d2a83 ("sh: remove sh5/sh64 last fragments") from the sh 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 --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index a913397c6b3c5..3ad614d359e44 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -93,7 +93,7 @@ endif endif -ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64)) +ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sparc64 x86_64)) TEST_GEN_PROGS += va_high_addr_switch TEST_GEN_PROGS += virtual_address_range TEST_GEN_PROGS += write_to_hugetlbfs