Commit 80b60e38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull core fixes from Ingo Molnar:
 "Three objtool fixes, plus marking SFI as obsolete"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Skip samples subdirectory
  objtool: Fix ARCH=x86_64 build error
  objtool: Silence build output
  MAINTAINERS: Mark simple firmware interface (SFI) obsolete
parents 701a9c80 74777eaf

MAINTAINERS

+1 −4
Original line number Diff line number Diff line
@@ -15177,11 +15177,8 @@ F: drivers/video/fbdev/sm712* 
F:	Documentation/fb/sm712fb.rst















SIMPLE FIRMWARE INTERFACE (SFI)













M:	Len Brown <lenb@kernel.org>













L:	sfi-devel@simplefirmware.org















W:	http://simplefirmware.org/













T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git













S:	Supported













S:	Obsolete















F:	arch/x86/platform/sfi/















F:	drivers/sfi/















F:	include/linux/sfi*.h

































samples/Makefile



+1
−0






























Original line number
Diff line number
Diff line















# SPDX-License-Identifier: GPL-2.0















# Makefile for Linux samples code













OBJECT_FILES_NON_STANDARD := y































obj-$(CONFIG_SAMPLE_ANDROID_BINDERFS)	+= binderfs/















obj-$(CONFIG_SAMPLE_CONFIGFS)		+= configfs/

































tools/objtool/Makefile



+1
−5






























Original line number
Diff line number
Diff line








@@ -2,10 +2,6 @@













include ../scripts/Makefile.include















include ../scripts/Makefile.arch





























ifeq ($(ARCH),x86_64)













ARCH := x86













endif





























# always use the host compiler















HOSTAR	?= ar















HOSTCC	?= gcc










@@ -33,7 +29,7 @@ all: $(OBJTOOL)





























INCLUDES := -I$(srctree)/tools/include \















	    -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \













	    -I$(srctree)/tools/arch/$(ARCH)/include













	    -I$(srctree)/tools/arch/$(SRCARCH)/include















WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed















CFLAGS   := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)















LDFLAGS  += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)

































tools/objtool/sync-check.sh



+0
−2






























Original line number
Diff line number
Diff line








@@ -48,5 +48,3 @@ check arch/x86/include/asm/inat.h     '-I "^#include [\"<]\(asm/\)*inat_types.h[













check arch/x86/include/asm/insn.h     '-I "^#include [\"<]\(asm/\)*inat.h[\">]"'















check arch/x86/lib/inat.c             '-I "^#include [\"<]\(../include/\)*asm/insn.h[\">]"'















check arch/x86/lib/insn.c             '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]" -I "^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]"'


























cd -


























































CRA Git | Maintained and supported by SUSTech CRA and CCSE