Received: by 2002:ac0:e34a:0:0:0:0:0 with SMTP id g10csp482099imn; Wed, 27 Jul 2022 11:25:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uN6Hc9k3Qi/tCDuTkpQT2alLuSEoIANEPjplwIEt1sE5AdKTkFOHd53FnT0b3fGe2tzxJq X-Received: by 2002:a05:6a00:b4c:b0:52a:f6e7:818b with SMTP id p12-20020a056a000b4c00b0052af6e7818bmr23093692pfo.26.1658946349508; Wed, 27 Jul 2022 11:25:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658946349; cv=none; d=google.com; s=arc-20160816; b=Y99cN8QAMHY4agPoaAWBizVwUwtSbFQ0NcUbfcHrU0bK8LnlaTos4Q5hGgSavX6Oyx B/VGuM3vUBB4oJhyVhbMqCbPg82FkusHs3sAf4G8rker7jW4rCivyi7NW4aelbPOoJ/R f+5/4J91AcXfhVheQukN8GSTQYHzJRa0U4lI+0y5LKecxHqn/ijfKqKNiAIg9PL4qnPS ujYb+m2o6i+xf8Vh3H/IZ681hankUnNEaGEPlWiBR2qR0YkO6azTHA3Z01AEV/CGbLKu NQVtryw5Cg1b9OiMOo4iyITqBcHr6C01LGVP9vvIMYytnCxFS3+CHqZIW+zSlL6En+5M Jg5Q== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zObAC3Jg9J1NOJYumJeALPmNI9GHpDgjdDEHPoOpFgQ=; b=BCFPrC/Hm1QZfD2mW47UujcQyK4FwVlK+KFHiQlUnf3frWZlPXcU26CnmC0KU+p/sG sXwGgsdwnZC/V8pjgeexq/Y60NFPF3L98O4mIpAp1omIDEz4BejH8rFjArBm9hwxiZbv rJpcLshWzl2FEx/hH1JwQOM3mNlQzPx9jSGNUYGNI5JJZnTcEeXlgnD20ZDjo510LYYC PGAJOjFp/n+0rS6Isn1kXD4pXJ65pNeuzg/QafKKvrJKKaty9uaPsk8Fr2Cq9iv3b7m4 z90H3Jv9w3cV5F7/oBMxDfDdX9wpYTpiDqXeXzzad/zVz8ycVRpKJutJYzuBl0j4qyIu Zuww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Rg9ygTRY; 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=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l17-20020a635b51000000b004128b3c45fasi20842002pgm.518.2022.07.27.11.25.33; Wed, 27 Jul 2022 11:25:49 -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=@linuxfoundation.org header.s=korg header.b=Rg9ygTRY; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240540AbiG0Qsj (ORCPT + 99 others); Wed, 27 Jul 2022 12:48:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240314AbiG0QsD (ORCPT ); Wed, 27 Jul 2022 12:48:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBCFB606A2; Wed, 27 Jul 2022 09:32:16 -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 67306619FF; Wed, 27 Jul 2022 16:32:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B724C433C1; Wed, 27 Jul 2022 16:32:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658939535; bh=CLfupA+ve829J+GGA8oCBo4IjFXt4oHO4dQK627Iol0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rg9ygTRYGpaGU09O3zvVOjTCHDj33qO8U2R8GQs69RGaARCNIiPKwCHdXVQiQtJjB ywjjQSptiCL51Wm6/OZkrK25r8IIPZddb9MjZLWpBqwP5MtAckE7Om7zj73GtgKck2 k3JBbVwMIbq46hkyhfuPNDv4abAnAswc+RC+FwnM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kernel test robot , Arnd Bergmann , Greg Ungerer , Sasha Levin Subject: [PATCH 5.10 016/105] Revert "m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch" Date: Wed, 27 Jul 2022 18:10:02 +0200 Message-Id: <20220727161012.728484473@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220727161012.056867467@linuxfoundation.org> References: <20220727161012.056867467@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 From: Greg Kroah-Hartman This reverts commit 87ae522e467e17a13b796e2cb595f9c3943e4d5e which is commit db87db65c1059f3be04506d122f8ec9b2fa3b05e upstream. It is not needed in 5.10.y and causes problems. Link: https://lore.kernel.org/r/CAK8P3a0vZrXxNp3YhrxFjFunHgxSZBKD9Y4darSODgeFAukCeQ@mail.gmail.com Reported-by: kernel test robot Reported-by: Arnd Bergmann Cc: Greg Ungerer Cc: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/m68k/Kconfig.bus | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/m68k/Kconfig.bus +++ b/arch/m68k/Kconfig.bus @@ -63,7 +63,7 @@ source "drivers/zorro/Kconfig" endif -if COLDFIRE +if !MMU config ISA_DMA_API def_bool !M5272