Merge branch 'linus' into perf/core, to pick up fixes (3782746a) · Commits · e / devices / android_kernel_teracube_emerald

MAINTAINERS

+10 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ Descriptions of section entries:
		Q: Patchwork web based patch tracking system site
		T: SCM tree type and location.
		Type is one of: git, hg, quilt, stgit, topgit
		B: Bug tracking system location.
		S: Status, one of the following:
		Supported: Someone is actually paid to look after this.
		Maintained: Someone actually looks after it.
		@@ -281,6 +282,7 @@ L: linux-acpi@vger.kernel.org
		W: https://01.org/linux-acpi
		Q: https://patchwork.kernel.org/project/linux-acpi/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
		B: https://bugzilla.kernel.org
		S: Supported
		F: drivers/acpi/
		F: drivers/pnp/pnpacpi/
		@@ -304,6 +306,8 @@ W: https://acpica.org/
		W: https://github.com/acpica/acpica/
		Q: https://patchwork.kernel.org/project/linux-acpi/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
		B: https://bugzilla.kernel.org
		B: https://bugs.acpica.org
		S: Supported
		F: drivers/acpi/acpica/
		F: include/acpi/
		@@ -313,6 +317,7 @@ ACPI FAN DRIVER
		M: Zhang Rui <rui.zhang@intel.com>
		L: linux-acpi@vger.kernel.org
		W: https://01.org/linux-acpi
		B: https://bugzilla.kernel.org
		S: Supported
		F: drivers/acpi/fan.c

		@@ -328,6 +333,7 @@ ACPI THERMAL DRIVER
		M: Zhang Rui <rui.zhang@intel.com>
		L: linux-acpi@vger.kernel.org
		W: https://01.org/linux-acpi
		B: https://bugzilla.kernel.org
		S: Supported
		F: drivers/acpi/thermal

		@@ -335,6 +341,7 @@ ACPI VIDEO DRIVER
		M: Zhang Rui <rui.zhang@intel.com>
		L: linux-acpi@vger.kernel.org
		W: https://01.org/linux-acpi
		B: https://bugzilla.kernel.org
		S: Supported
		F: drivers/acpi/acpi_video.c

		@@ -5663,6 +5670,7 @@ HIBERNATION (aka Software Suspend, aka swsusp)
		M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
		M: Pavel Machek <pavel@ucw.cz>
		L: linux-pm@vger.kernel.org
		B: https://bugzilla.kernel.org
		S: Supported
		F: arch/x86/power/
		F: drivers/base/power/
		@@ -9624,6 +9632,7 @@ POWER MANAGEMENT CORE
		M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
		L: linux-pm@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
		B: https://bugzilla.kernel.org
		S: Supported
		F: drivers/base/power/
		F: include/linux/pm.h
		@@ -11613,6 +11622,7 @@ M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
		M: Len Brown <len.brown@intel.com>
		M: Pavel Machek <pavel@ucw.cz>
		L: linux-pm@vger.kernel.org
		B: https://bugzilla.kernel.org
		S: Supported
		F: Documentation/power/
		F: arch/x86/kernel/acpi/

Makefile

+1 −3

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 0
		EXTRAVERSION = -rc6
		EXTRAVERSION = -rc7
		NAME = Psychotic Stoned Sheep

		# DOCUMENTATION
		@@ -1019,8 +1019,6 @@ prepare2: prepare3 prepare-compiler-check outputmakefile asm-generic
		prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
		include/config/auto.conf
		$(cmd_crmodverdir)
		$(Q)test -e include/generated/autoksyms.h \|\| \
		touch include/generated/autoksyms.h

		archprepare: archheaders archscripts prepare1 scripts_basic

arch/arc/include/asm/delay.h

+5 −4

Original line number	Diff line number	Diff line
		@@ -22,10 +22,11 @@
		static inline void __delay(unsigned long loops)
		{
		__asm__ __volatile__(
		" mov lp_count, %0 \n"
		" lp 1f \n"
		" nop \n"
		"1: \n"
		: "+l"(loops));
		: : "r"(loops));
		}

		extern void __bad_udelay(void);

arch/arc/include/asm/pgtable.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -280,7 +280,7 @@ static inline void pmd_set(pmd_t pmdp, pte_t ptep)

		#define pte_page(pte) pfn_to_page(pte_pfn(pte))
		#define mk_pte(page, prot) pfn_pte(page_to_pfn(page), prot)
		#define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) \| pgprot_val(prot))
		#define pfn_pte(pfn, prot) __pte(__pfn_to_phys(pfn) \| pgprot_val(prot))

		/* Don't use virt_to_pfn for macros below: could cause truncations for PAE40*/
		#define pte_pfn(pte) (pte_val(pte) >> PAGE_SHIFT)

arch/arc/mm/cache.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@

		static int l2_line_sz;
		static int ioc_exists;
		int slc_enable = 1, ioc_enable = 1;
		int slc_enable = 1, ioc_enable = 0;
		unsigned long perip_base = ARC_UNCACHED_ADDR_SPACE; /* legacy value for boot */
		unsigned long perip_end = 0xFFFFFFFF; /* legacy value */