From patchwork Thu Apr 13 13:58:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 83001 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1064908vqo; Thu, 13 Apr 2023 07:09:43 -0700 (PDT) X-Google-Smtp-Source: AKy350anxvJTkTLRAXOSOZECr7f2amrfOaW73BzynJoi1/GYsuKtBe07S/VAorO/Q6EmhFqdnlD+ X-Received: by 2002:a05:6402:4cb:b0:504:9350:f458 with SMTP id n11-20020a05640204cb00b005049350f458mr2022283edw.1.1681394983263; Thu, 13 Apr 2023 07:09:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681394983; cv=none; d=google.com; s=arc-20160816; b=Vx8CaC6teyiUkqD3DvWhvqvwwmCWUjo5WobPD8cCo9b0yEDyrWxFFmBUsyGYHixaCl 7kE7ExWFI9q43JrSIr+vm2OypAwgt3Ym435M+nvrxt9dK5KWXl4xGnoGFcHxnBH4gPTd QoLjbmhY80BPabq7eftLXrfoffnOpO1ZFbaX0gRB3+WLJqeXjMIprtFmd21DSzl89hk1 l7H46QAIeK0H6/77sr+ihSWPgjgBUu6kEt9PpSFFipcC1rOo/MxR94IBe+rrTYWrahXl 2WFueZhFDWWZpSCshvSfK38HIjasZeoLyOq8nAKEdU5AnUEr49GOsrOpwvgM3h0UTTne SdVQ== 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=qRvzqwB2qkX+ElT4itzj0zZ1Icyso7tL7iVhWGmI9L4=; b=iK4++xJVR6rlVLb2Uj5P8L6Ndl7WLEIvdrobhSFU56CNJ9fhb0dRNNdWsNK3qs+Z4T ImU62w+eTY6+8tAdipTzIXszl8Zg3hcA6OhH8RaqkUkcZtfJYrs5P3vKCfAW9HEtT6Pj Vn2clkhIxafK9FuYrc/0HM21s1DAqAhQIpM+AMs26tbCzY2OmgvHsINS7LVSrRx6PanE jY/z/HZpV/1LzfmpZWatYPWAZf5w/XAjfCulBuSJqwKL6KUVzXKaHEbkzNLSFyKm9Nq8 znYSiDMExSnLQlfnlvqlHz3ddKHWbZTDQtNoF0pxfkF6062YQzXHQWx7A59GK8+ONaRe mtaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DLUR65ki; 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 w9-20020aa7cb49000000b0050503968349si1854964edt.487.2023.04.13.07.09.18; Thu, 13 Apr 2023 07:09:43 -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=DLUR65ki; 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 S231638AbjDMN6e (ORCPT + 99 others); Thu, 13 Apr 2023 09:58:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231510AbjDMN6c (ORCPT ); Thu, 13 Apr 2023 09:58:32 -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 097FF109; Thu, 13 Apr 2023 06:58:26 -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 90B1163EDE; Thu, 13 Apr 2023 13:58:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A999C433EF; Thu, 13 Apr 2023 13:58:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681394305; bh=ELNGDv+vluokZUPB3x+lMCFicXn8cWCZyU4JxAkwrmI=; h=From:To:Cc:Subject:Date:From; b=DLUR65kiTyXZH7YRuyl+sc/Y1zv72Zb16a6IEFdQlf2n6bKdkeHqNlOV/PRo8VJF5 olvRJQS6yZGbWIX7lxt61HsrKtH/JTJ49jmAppmR/gt8K1+Zjo0Bu1K1zwEVFCaHx3 QNhRF7sClLbboWq+8BSjsR2kPie7lde3OiL9yj8iXQja4MN0JalIyRxh35f6AHudEx dTXFJFqWCVSM2QgQ2jZr/SDjn+5LGWRe5nClmJLYgAV2Psmjj91j7vI+jAshSWjtCd ZbsDxNHKEm4d57ZbonLqyerhEbdMMoDImUEXyxYpQeEIygfN4Ci2bjAclZZhS6AFnV vAEZ02Cqe8aIQ== 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: Thu, 13 Apr 2023 14:58:15 +0100 Message-Id: <20230413135815.3254620-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 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?1763070425927478555?= X-GMAIL-MSGID: =?utf-8?q?1763070425927478555?= Hi all, Today's linux-next merge of the sh tree got a conflict in: tools/testing/selftests/mm/Makefile between commit: 14940f545c315 ("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. +++ b/tools/testing/selftests/mm/Makefile @@@ -93,10 -90,10 +93,10 @@@ endi 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_FILES += va_128TBswitch -TEST_GEN_FILES += virtual_address_range -TEST_GEN_FILES += write_to_hugetlbfs +TEST_GEN_PROGS += va_128TBswitch +TEST_GEN_PROGS += virtual_address_range +TEST_GEN_PROGS += write_to_hugetlbfs endif TEST_PROGS := run_vmtests.sh diff --cc tools/testing/selftests/mm/Makefile index 5a34344194035,fc35050b5542f..0000000000000 --- a/tools/testing/selftests/mm/Makefile