Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp4184402pxk; Tue, 8 Sep 2020 12:54:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXP44KSC5LXtHsFUcMLwIuNrhRmKzlUuG/9GTA7y3iaN4Fy/guDVmzvKoe+iPnO0uEr1Dj X-Received: by 2002:a17:906:7856:: with SMTP id p22mr104198ejm.262.1599594893546; Tue, 08 Sep 2020 12:54:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599594893; cv=none; d=google.com; s=arc-20160816; b=0UBNiWmCcfVXXUjHloqgFPf1EkKZcHEmP1RExDsYjJeMoRcJiKRDn8Ac7hPQhZOD5T kOZ2VqzTUG78LjzL+AWtl7A01jMhFhE6rNu6DrXqs8pRXk3gciqpJiZqgpj6VBofaXg5 wBf4nxAEubkpnRbvx8exP3uDOl5LeaHzmbhe/uBp+i8fb7tALBnpzLKSfllrsIVP1BT/ 0/75rB1dBhr3Q9JdodrG4qn+WBoO+drSjutMtDvz4pCQ4xaHgXivbLMSyUZcRkSkq+zc 5T8dwMXkZoicmrRSkIzwwbcR0wRIPas4RBFJUaDOAZpPT62sJJhrcsntXzscG+KCIm3O shcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=KWqIw6HASvqd9vy5mX7KZSw6G9DbJXB+jkP7p6kms+U=; b=uX81faOFNfAJruZ219SBIvHsMXnvQLgrDPXDhpA1GFGoshf83wnFICCt5/G4/4uIZd 5moDqcwDxedgJTtIEAFYmoL/wkmIbHI3Z68NZweBTLxF7NOK4+szem7+Ku84bTL7Jak/ wZrkQ4T08dF+FeEHbXg/kZdOL8sxxUWdcQBg5MvhB/7klweI2WWZz7YnthezLok35O2S d8uVAH9/ZopCcqSaj3XkW6jHYvBO4XVlcm1UKnS7I/4MU58phOudzGC7vGZm6EYF3U2e XSayQwkRnir9kDXz8HpTH62UGkfzt1yAYYz266jgI7adqJxyu4QnJolWDKN51++PGFRq Od7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KmfyECme; 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=fail (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 h12si18199eje.650.2020.09.08.12.54.30; Tue, 08 Sep 2020 12:54:53 -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=@kernel.org header.s=default header.b=KmfyECme; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732457AbgIHTxz (ORCPT + 99 others); Tue, 8 Sep 2020 15:53:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:60620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729026AbgIHPmc (ORCPT ); Tue, 8 Sep 2020 11:42:32 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 855BA20936; Tue, 8 Sep 2020 15:21:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599578516; bh=Kz+MsIx+k0H0Jyjr25FoFiXZUgZRjJfbjCM/BqH9qMI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=KmfyECmelqzQhvE3og7RX1xbYVDY8b1ej613t07oSH4GQEQQ1cvKbuxDoQbtxCGYj mW1IILvjiaCd2v8ko8zi27vBMSd8xrLOqppC2lFtuwCEC0LkilFcSVvj76leMu2OW/ LmXxYGP8UIWfpiTbcAR60Xb+HsaihKhoPRBC8gHI= Date: Tue, 8 Sep 2020 17:22:07 +0200 From: Greg KH To: Mike Travis Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, Steve Wahl , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Arnd Bergmann , Greg Kroah-Hartman , Dimitri Sivanich , "H. Peter Anvin" , Russ Anderson , Darren Hart , Andy Shevchenko , Alexandre Chartre , Jian Cai , Vitaly Kuznetsov , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: Re: [PATCH 03/12] x86/platform/uv: Adjust references in UV kernel modules Message-ID: <20200908152207.GC4114051@kroah.com> References: <20200907185430.363197758@hpe.com> <20200907185430.685975987@hpe.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200907185430.685975987@hpe.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 07, 2020 at 01:54:33PM -0500, Mike Travis wrote: > There is a symbol clash from the auto-generated uv_mmrs.h file that > clashes with code in the UV kernel modules (is_uv() is the symbol). > Change those prior to the symbol clash so as to not cause a compile error. > > Signed-off-by: Mike Travis > Reviewed-by: Dimitri Sivanich > Reviewed-by: Steve Wahl > --- > drivers/misc/sgi-xp/xp.h | 11 ++++++----- > drivers/misc/sgi-xp/xp_main.c | 7 ++++--- > drivers/misc/sgi-xp/xp_uv.c | 9 ++++++--- > drivers/misc/sgi-xp/xpc_main.c | 9 +++++---- > drivers/misc/sgi-xp/xpc_partition.c | 5 +++-- > drivers/misc/sgi-xp/xpnet.c | 5 +++-- > 6 files changed, 27 insertions(+), 19 deletions(-) > > --- linux.orig/drivers/misc/sgi-xp/xp.h > +++ linux/drivers/misc/sgi-xp/xp.h > @@ -3,7 +3,8 @@ > * License. See the file "COPYING" in the main directory of this archive > * for more details. > * > - * Copyright (C) 2004-2008 Silicon Graphics, Inc. All rights reserved. > + * Copyright (c) 2018-2020 Hewlett Packard Enterprise Development LP > + * Copyright (c) 2008-2017 Silicon Graphics, Inc. All Rights Reserved. This change does not make sense. If you want to make it, please make it in a separate patch that justifies the dates being added here please. thanks, greg k-h