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 <mike.travis@xxxxxxx> > Reviewed-by: Dimitri Sivanich <dimitri.sivanich@xxxxxxx> > Reviewed-by: Steve Wahl <steve.wahl@xxxxxxx> > --- > 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
