Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp51136pxp; Thu, 10 Mar 2022 22:15:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQchqOdUzaCpLI8nB0BNFUenbchr8DGMEs5bVrjrkTyOyIqblBnSA/dZ4tssVuSgdbE5uQ X-Received: by 2002:a17:90a:4f0b:b0:1be:e31f:bd38 with SMTP id p11-20020a17090a4f0b00b001bee31fbd38mr20308603pjh.76.1646979356958; Thu, 10 Mar 2022 22:15:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646979356; cv=none; d=google.com; s=arc-20160816; b=avXjxuhev9h0hsS7dSgiofY5iI56sbgvACIKNoL+i2vsWpfZ3uFR4A2fhJTKeT8BGf yjrOeA9yJjoH2XcJ5RiwQ+RUVuJXvL4wTvuJJJHQAN7iXwh458udiF64l/spgtkoc9Ct KHk+hO61mvnDvwD01iZxBC2oKuKDXlHdDUmFImZol0hE5c47AteW7V4bwjAKGE2swpR+ QoSr+pbXaWHhLjcCpU8Mk297iW8mX3GVugf2YKlMwC1aHvDwyNSGVYsmspsg+9L2aPF1 mj7h27ihVXQQrdXETfXDKYO+TKqTjOVhHQnxD6Ls3CUARWzzayYL5b0ghBgdIco5SFt+ RMVw== 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=MOp5dfA48r7VFs4//J06fI4rY1TI5uUYHKHfUcmYDcM=; b=j4rp4N1z9V83ZHyZihACN4o18JeXJkI4DLWIXeGv583GJtJh4sI6JA6SuAYdIO/UBb Ox0wK/Ms3dz4Eq7NCQg4QExeaioNF60rTCL9wAFu2Yywnd+hkbD31BytsnU5/zH+oC0s 7rld5jjWRUvL+Eo8opojoTtZg1if9iVhiuVkAFuyHea1MEGMHrNWqJ1jhNUGQtFnsRLv VagCjTm54aciI2au2IxjxOxib+IqL6/9y/A8jj2K5FTzd5owwTsotOZuwrQRMpEJe/lk cjeu1kAnPRnM8GtVfz/LYFtg5woXn1rdm+vEsuvTFER3frxVQme8APg1wjx2MK3/VSth oMDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=G+eW0QO2; 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 s22-20020a056a00195600b004f78a93e81bsi1457029pfk.140.2022.03.10.22.15.40; Thu, 10 Mar 2022 22:15:56 -0800 (PST) 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=G+eW0QO2; 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 S1343789AbiCJOkI (ORCPT + 99 others); Thu, 10 Mar 2022 09:40:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343933AbiCJOba (ORCPT ); Thu, 10 Mar 2022 09:31:30 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9EDAEA74F; Thu, 10 Mar 2022 06:28:48 -0800 (PST) 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 64B6B61C0A; Thu, 10 Mar 2022 14:28:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FC41C340E8; Thu, 10 Mar 2022 14:28:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1646922527; bh=YnxLeomZr+WCm3j3/G5Xk8FKG/OO3SIXhb//3Tp3bvQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G+eW0QO2bPR656P8Y+uRlJygyhH/nkTtfjA/3lLOTfWCOF0Gwyp4Cu/CseVI1vpDF 0DC2guGrM4llXW5/4Q+CGJTp3VCM4YP4iAA15RD5q+jdksfve4hnyzlbFBgKT1QYmp Ii1U5XQrhXFyvdvDvtib0OCEFPTBnrGCU5AsBBgQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, lkp@intel.com, Huang Pei , "David S. Miller" , Guenter Roeck Subject: [PATCH 5.15 01/58] slip: fix macro redefine warning Date: Thu, 10 Mar 2022 15:18:50 +0100 Message-Id: <20220310140813.027135161@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220310140812.983088611@linuxfoundation.org> References: <20220310140812.983088611@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 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,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 From: Huang Pei commit e5b40668e930979bd1e82c7ed7c9029db635f0e4 upstream. MIPS/IA64 define END as assembly function ending, which conflict with END definition in slip.h, just undef it at first Reported-by: lkp@intel.com Signed-off-by: Huang Pei Signed-off-by: David S. Miller Cc: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- drivers/net/slip/slip.h | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/slip/slip.h +++ b/drivers/net/slip/slip.h @@ -40,6 +40,8 @@ insmod -oslip_maxdev=nnn */ #define SL_MTU 296 /* 296; I am used to 600- FvK */ +/* some arch define END as assembly function ending, just undef it */ +#undef END /* SLIP protocol characters. */ #define END 0300 /* indicates end of frame */ #define ESC 0333 /* indicates byte stuffing */