Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2469120pxb; Mon, 19 Apr 2021 06:31:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSDJ1sNcm9/Flb5Du8j8abwKXY/wUIftCi0U/HISFfXNY9jS+Z7QiSVul6Qo14JOePkuH7 X-Received: by 2002:a17:906:32d1:: with SMTP id k17mr21944469ejk.94.1618839084664; Mon, 19 Apr 2021 06:31:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618839084; cv=none; d=google.com; s=arc-20160816; b=yrTGTv/Gkb7XjPnLBzc6X2oSyqXIO4QpkIyHUf6kNgRAZZm163k5MOLnJGS+HzXIzG LoH84nOpmaql1CiaiLnWZfoH5Vh8JJ7sEGw8viqtKF3OIq3T+FkhlYy/XbVEiqHS9hUW ofS8Nbh8EkyX2iJmZdNaz3S0jI9/1G4mN7iubedntZXk1JkpTFYErZ0bcg2cWZ6QOZHE eFKFeQZIjDp0Q0hARk/xaJbt1KndlGNUxIoYPDLze1RHIZL6hd09hG8olRuletQezZsm 5FT6VFkCefA2rDqOYol3ZJoPhXuxa6r38QwosiL0BvvsbZkh0p5DBUXIZ2ebkEvEwmGg vbYQ== 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=9Hnrohq0sXjIOcsaHROQzdm8kEusAcACQ3BcdssL3AQ=; b=pkQutoeHP3OZjNNZpMMB2JVcYx+z3ZQRAvrlKTYJjq54ootSmte9ykjIMVGISF9YKD K8UB6nO8vHVLDSvBAoUCVrH/pFPoDbq8iLk3kL/DUxtMjHxlXNACJcXcc7YGcDccDKZT 5mT2FE/n2OtZZLGcDC6fLFkuMyZ8M97m8qLDGgohfT1udKEKAODSw27Ioytj3iX1+qRa OmHIl0T2XKnvzXDwcQU53EYQJ3lbpOO6fiUVYexwx4PD9hprQIba+hbpPqqyGWYx7h7j 2JN3vn/Y03nUUm9ZBvy1uphlVnAXkB+s42EgxwTUK1mGjqJV/WsapKa80F83VggKrbFP K1TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jzwpaFZX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bw22si4884579ejb.745.2021.04.19.06.30.55; Mon, 19 Apr 2021 06:31:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jzwpaFZX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S241053AbhDSN3G (ORCPT + 99 others); Mon, 19 Apr 2021 09:29:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:55076 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241458AbhDSNUg (ORCPT ); Mon, 19 Apr 2021 09:20:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 14E19613D7; Mon, 19 Apr 2021 13:16:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618838212; bh=zo2VGUA4vjyaBsM1mgdZmdaQSOR5md7ENQk7yO5LMLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jzwpaFZXN0WUjau/J8Iw2BvrlfusAfoISgqzEWVWf0zVWXE9NXbbbIy04Q8BIXrsj WQXf5oN1AFRTuruMDtqdTwhlBQKzkpwM8AIB1BIDTQ9j5wkg2BV6kUla1Ri5ceXEBz yJVBy0WOKwX4Z9SU9BuxgyCJdUq4m2f6rHy/r9q8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , Geert Uytterhoeven , Christoph Hellwig , Tony Luck , Fenghua Yu , Andrew Morton , Linus Torvalds Subject: [PATCH 5.10 076/103] ia64: remove duplicate entries in generic_defconfig Date: Mon, 19 Apr 2021 15:06:27 +0200 Message-Id: <20210419130530.422894477@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419130527.791982064@linuxfoundation.org> References: <20210419130527.791982064@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap commit 19d000d93303e05bd7b1326e3de9df05a41b25b5 upstream. Fix ia64 generic_defconfig duplicate entries, as warned by: arch/ia64/configs/generic_defconfig: warning: override: reassigning to symbol ATA: => 58 arch/ia64/configs/generic_defconfig: warning: override: reassigning to symbol ATA_PIIX: => 59 These 2 symbols still have the same value as in the removed lines. Link: https://lkml.kernel.org/r/20210411020255.18052-1-rdunlap@infradead.org Fixes: c331649e6371 ("ia64: Use libata instead of the legacy ide driver in defconfigs") Signed-off-by: Randy Dunlap Reported-by: Geert Uytterhoeven Reviewed-by: Christoph Hellwig Cc: Tony Luck Cc: Fenghua Yu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- arch/ia64/configs/generic_defconfig | 2 -- 1 file changed, 2 deletions(-) --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig @@ -55,8 +55,6 @@ CONFIG_CHR_DEV_SG=m CONFIG_SCSI_FC_ATTRS=y CONFIG_SCSI_SYM53C8XX_2=y CONFIG_SCSI_QLOGIC_1280=y -CONFIG_ATA=y -CONFIG_ATA_PIIX=y CONFIG_SATA_VITESSE=y CONFIG_MD=y CONFIG_BLK_DEV_MD=m