Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3431e490 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-scan' into acpi-pm 

Conflicts:
	drivers/acpi/scan.c

The conflict is resolved by moving the just introduced
acpi_device_is_first_physical_node() to bus.c and using
the existing acpi_companion_match() from there.

There will be an additional commit to combine the two.
parents 5af310a8 1dcc3d33

Documentation/kbuild/makefiles.txt

+8 −0
Original line number Diff line number Diff line
@@ -952,6 +952,14 @@ When kbuild executes, the following steps are followed (roughly): 
	$(KBUILD_ARFLAGS) set by the top level Makefile to "D" (deterministic

	mode) if this option is supported by $(AR).



    ARCH_CPPFLAGS, ARCH_AFLAGS, ARCH_CFLAGS   Overrides the kbuild defaults



	These variables are appended to the KBUILD_CPPFLAGS,

	KBUILD_AFLAGS, and KBUILD_CFLAGS, respectively, after the

	top-level Makefile has set any other flags. This provides a

	means for an architecture to override the defaults.





--- 6.2 Add prerequisites to archheaders:



	The archheaders: rule is used to generate header files that

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7019,6 +7019,7 @@ F: include/uapi/linux/netfilter/ 
F:	net/*/netfilter.c

F:	net/*/netfilter/

F:	net/netfilter/

F:	net/bridge/br_netfilter*.c



NETLABEL

M:	Paul Moore <paul@paul-moore.com>

Makefile

+5 −4
Original line number Diff line number Diff line
@@ -780,10 +780,11 @@ endif 
include scripts/Makefile.kasan

include scripts/Makefile.extrawarn



# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments

KBUILD_CPPFLAGS += $(KCPPFLAGS)

KBUILD_AFLAGS += $(KAFLAGS)

KBUILD_CFLAGS += $(KCFLAGS)

# Add any arch overrides and user supplied CPPFLAGS, AFLAGS and CFLAGS as the

# last assignments

KBUILD_CPPFLAGS += $(ARCH_CPPFLAGS) $(KCPPFLAGS)

KBUILD_AFLAGS   += $(ARCH_AFLAGS)   $(KAFLAGS)

KBUILD_CFLAGS   += $(ARCH_CFLAGS)   $(KCFLAGS)



# Use --build-id when available.

LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\

arch/arc/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ if ISA_ARCOMPACT 


config ARC_CPU_750D

	bool "ARC750D"

	select ARC_CANT_LLSC

	help

	  Support for ARC750 core
@@ -362,7 +363,7 @@ config ARC_CANT_LLSC 
config ARC_HAS_LLSC

	bool "Insn: LLOCK/SCOND (efficient atomic ops)"

	default y

	depends on !ARC_CPU_750D && !ARC_CANT_LLSC

	depends on !ARC_CANT_LLSC



config ARC_HAS_SWAPE

	bool "Insn: SWAPE (endian-swap)"

arch/arc/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ endif 


ifndef CONFIG_CC_OPTIMIZE_FOR_SIZE

# Generic build system uses -O2, we want -O3

cflags-y  += -O3

# Note: No need to add to cflags-y as that happens anyways

ARCH_CFLAGS += -O3

endif



# small data is default for elf32 tool-chain. If not usable, disable it