Merge branch 'depends/rmk/for-linus' into next/soc (23c4c1c7) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/ABI/testing/sysfs-bus-rbd

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -57,13 +57,6 @@ create_snap

	$ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create		$ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create

	rollback_snap

	Rolls back data to the specified snapshot. This goes over the entire
	list of rados blocks and sends a rollback command to each.

	$ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback

	snap_*		snap_*

	A directory per each snapshot		A directory per each snapshot

Documentation/virtual/kvm/api.txt

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1100,6 +1100,15 @@ emulate them efficiently. The fields in each entry are defined as follows:
	eax, ebx, ecx, edx: the values returned by the cpuid instruction for		eax, ebx, ecx, edx: the values returned by the cpuid instruction for
	this function/index combination		this function/index combination

			The TSC deadline timer feature (CPUID leaf 1, ecx[24]) is always returned
			as false, since the feature depends on KVM_CREATE_IRQCHIP for local APIC
			support. Instead it is reported via

			ioctl(KVM_CHECK_EXTENSION, KVM_CAP_TSC_DEADLINE_TIMER)

			if that returns true and you use KVM_CREATE_IRQCHIP, or if you emulate the
			feature in userspace, then you can enable the feature for KVM_SET_CPUID2.

	4.47 KVM_PPC_GET_PVINFO		4.47 KVM_PPC_GET_PVINFO

	Capability: KVM_CAP_PPC_GET_PVINFO		Capability: KVM_CAP_PPC_GET_PVINFO
	@@ -1151,6 +1160,13 @@ following flags are specified:
	/* Depends on KVM_CAP_IOMMU */		/* Depends on KVM_CAP_IOMMU */
	#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)		#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)

			The KVM_DEV_ASSIGN_ENABLE_IOMMU flag is a mandatory option to ensure
			isolation of the device. Usages not specifying this flag are deprecated.

			Only PCI header type 0 devices with PCI BAR resources are supported by
			device assignment. The user requesting this ioctl must have read/write
			access to the PCI sysfs resource files associated with the device.

	4.49 KVM_DEASSIGN_PCI_DEVICE		4.49 KVM_DEASSIGN_PCI_DEVICE

	Capability: KVM_CAP_DEVICE_DEASSIGNMENT		Capability: KVM_CAP_DEVICE_DEASSIGNMENT

MAINTAINERS

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -1124,13 +1124,6 @@ S: Supported
	F: arch/arm/mach-shmobile/		F: arch/arm/mach-shmobile/
	F: drivers/sh/		F: drivers/sh/

	ARM/TELECHIPS ARM ARCHITECTURE
	M: "Hans J. Koch" <hjk@hansjkoch.de>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	S: Maintained
	F: arch/arm/plat-tcc/
	F: arch/arm/mach-tcc8k/

	ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT		ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
	M: Lennert Buytenhek <kernel@wantstofly.org>		M: Lennert Buytenhek <kernel@wantstofly.org>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	@@ -2700,7 +2693,7 @@ FIREWIRE SUBSYSTEM
	M: Stefan Richter <stefanr@s5r6.in-berlin.de>		M: Stefan Richter <stefanr@s5r6.in-berlin.de>
	L: linux1394-devel@lists.sourceforge.net		L: linux1394-devel@lists.sourceforge.net
	W: http://ieee1394.wiki.kernel.org/		W: http://ieee1394.wiki.kernel.org/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git
	S: Maintained		S: Maintained
	F: drivers/firewire/		F: drivers/firewire/
	F: include/linux/firewire*.h		F: include/linux/firewire*.h
	@@ -3101,6 +3094,7 @@ F: include/linux/hid*

	HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS		HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
	M: Thomas Gleixner <tglx@linutronix.de>		M: Thomas Gleixner <tglx@linutronix.de>
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
	S: Maintained		S: Maintained
	F: Documentation/timers/		F: Documentation/timers/
	F: kernel/hrtimer.c		F: kernel/hrtimer.c
	@@ -3610,7 +3604,7 @@ F: net/irda/
	IRQ SUBSYSTEM		IRQ SUBSYSTEM
	M: Thomas Gleixner <tglx@linutronix.de>		M: Thomas Gleixner <tglx@linutronix.de>
	S: Maintained		S: Maintained
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq/core		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
	F: kernel/irq/		F: kernel/irq/

	ISAPNP		ISAPNP
	@@ -4098,7 +4092,7 @@ F: drivers/hwmon/lm90.c
	LOCKDEP AND LOCKSTAT		LOCKDEP AND LOCKSTAT
	M: Peter Zijlstra <peterz@infradead.org>		M: Peter Zijlstra <peterz@infradead.org>
	M: Ingo Molnar <mingo@redhat.com>		M: Ingo Molnar <mingo@redhat.com>
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking
	S: Maintained		S: Maintained
	F: Documentation/lockdep*.txt		F: Documentation/lockdep*.txt
	F: Documentation/lockstat.txt		F: Documentation/lockstat.txt
	@@ -4280,7 +4274,9 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
	S: Maintained		S: Maintained
	F: Documentation/dvb/		F: Documentation/dvb/
	F: Documentation/video4linux/		F: Documentation/video4linux/
			F: Documentation/DocBook/media/
	F: drivers/media/		F: drivers/media/
			F: drivers/staging/media/
	F: include/media/		F: include/media/
	F: include/linux/dvb/		F: include/linux/dvb/
	F: include/linux/videodev*.h		F: include/linux/videodev*.h
	@@ -5086,6 +5082,7 @@ M: Peter Zijlstra <a.p.zijlstra@chello.nl>
	M: Paul Mackerras <paulus@samba.org>		M: Paul Mackerras <paulus@samba.org>
	M: Ingo Molnar <mingo@elte.hu>		M: Ingo Molnar <mingo@elte.hu>
	M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>		M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
	S: Supported		S: Supported
	F: kernel/events/*		F: kernel/events/*
	F: include/linux/perf_event.h		F: include/linux/perf_event.h
	@@ -5165,6 +5162,7 @@ F: drivers/scsi/pm8001/

	POSIX CLOCKS and TIMERS		POSIX CLOCKS and TIMERS
	M: Thomas Gleixner <tglx@linutronix.de>		M: Thomas Gleixner <tglx@linutronix.de>
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
	S: Supported		S: Supported
	F: fs/timerfd.c		F: fs/timerfd.c
	F: include/linux/timer*		F: include/linux/timer*
	@@ -5680,6 +5678,7 @@ F: drivers/dma/dw_dmac.c
	TIMEKEEPING, NTP		TIMEKEEPING, NTP
	M: John Stultz <johnstul@us.ibm.com>		M: John Stultz <johnstul@us.ibm.com>
	M: Thomas Gleixner <tglx@linutronix.de>		M: Thomas Gleixner <tglx@linutronix.de>
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
	S: Supported		S: Supported
	F: include/linux/clocksource.h		F: include/linux/clocksource.h
	F: include/linux/time.h		F: include/linux/time.h
	@@ -5704,6 +5703,7 @@ F: drivers/watchdog/sc1200wdt.c
	SCHEDULER		SCHEDULER
	M: Ingo Molnar <mingo@elte.hu>		M: Ingo Molnar <mingo@elte.hu>
	M: Peter Zijlstra <peterz@infradead.org>		M: Peter Zijlstra <peterz@infradead.org>
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
	S: Maintained		S: Maintained
	F: kernel/sched*		F: kernel/sched*
	F: include/linux/sched.h		F: include/linux/sched.h
	@@ -6631,7 +6631,7 @@ TRACING
	M: Steven Rostedt <rostedt@goodmis.org>		M: Steven Rostedt <rostedt@goodmis.org>
	M: Frederic Weisbecker <fweisbec@gmail.com>		M: Frederic Weisbecker <fweisbec@gmail.com>
	M: Ingo Molnar <mingo@redhat.com>		M: Ingo Molnar <mingo@redhat.com>
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
	S: Maintained		S: Maintained
	F: Documentation/trace/ftrace.txt		F: Documentation/trace/ftrace.txt
	F: arch///*/ftrace.h		F: arch///*/ftrace.h
	@@ -7381,7 +7381,7 @@ M: Thomas Gleixner <tglx@linutronix.de>
	M: Ingo Molnar <mingo@redhat.com>		M: Ingo Molnar <mingo@redhat.com>
	M: "H. Peter Anvin" <hpa@zytor.com>		M: "H. Peter Anvin" <hpa@zytor.com>
	M: x86@kernel.org		M: x86@kernel.org
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
	S: Maintained		S: Maintained
	F: Documentation/x86/		F: Documentation/x86/
	F: arch/x86/		F: arch/x86/

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 3		VERSION = 3
	PATCHLEVEL = 2		PATCHLEVEL = 2
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc5		EXTRAVERSION = -rc7
	NAME = Saber-toothed Squirrel		NAME = Saber-toothed Squirrel

	# DOCUMENTATION		# DOCUMENTATION

arch/arm/Kconfig

+42 −19

Original line number	Original line	Diff line number	Diff line
	@@ -220,8 +220,9 @@ config NEED_MACH_MEMORY_H
	be avoided when possible.		be avoided when possible.

	config PHYS_OFFSET		config PHYS_OFFSET
	hex "Physical address of main memory"		hex "Physical address of main memory" if MMU
	depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H		depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H
			default DRAM_BASE if !MMU
	help		help
	Please provide the physical address corresponding to the		Please provide the physical address corresponding to the
	location of main memory in your system.		location of main memory in your system.
	@@ -257,6 +258,7 @@ config ARCH_INTEGRATOR
	select ARCH_HAS_CPUFREQ		select ARCH_HAS_CPUFREQ
	select CLKDEV_LOOKUP		select CLKDEV_LOOKUP
	select HAVE_MACH_CLKDEV		select HAVE_MACH_CLKDEV
			select HAVE_TCM
	select ICST		select ICST
	select GENERIC_CLOCKEVENTS		select GENERIC_CLOCKEVENTS
	select PLAT_VERSATILE		select PLAT_VERSATILE
	@@ -340,10 +342,12 @@ config ARCH_HIGHBANK
	select ARM_AMBA		select ARM_AMBA
	select ARM_GIC		select ARM_GIC
	select ARM_TIMER_SP804		select ARM_TIMER_SP804
			select CACHE_L2X0
	select CLKDEV_LOOKUP		select CLKDEV_LOOKUP
	select CPU_V7		select CPU_V7
	select GENERIC_CLOCKEVENTS		select GENERIC_CLOCKEVENTS
	select HAVE_ARM_SCU		select HAVE_ARM_SCU
			select HAVE_SMP
	select USE_OF		select USE_OF
	help		help
	Support for the Calxeda Highbank SoC based boards.		Support for the Calxeda Highbank SoC based boards.
	@@ -361,6 +365,7 @@ config ARCH_CNS3XXX
	select CPU_V6K		select CPU_V6K
	select GENERIC_CLOCKEVENTS		select GENERIC_CLOCKEVENTS
	select ARM_GIC		select ARM_GIC
			select MIGHT_HAVE_CACHE_L2X0
	select MIGHT_HAVE_PCI		select MIGHT_HAVE_PCI
	select PCI_DOMAINS if PCI		select PCI_DOMAINS if PCI
	help		help
	@@ -381,6 +386,7 @@ config ARCH_PRIMA2
	select GENERIC_CLOCKEVENTS		select GENERIC_CLOCKEVENTS
	select CLKDEV_LOOKUP		select CLKDEV_LOOKUP
	select GENERIC_IRQ_CHIP		select GENERIC_IRQ_CHIP
			select MIGHT_HAVE_CACHE_L2X0
	select USE_OF		select USE_OF
	select ZONE_DMA		select ZONE_DMA
	help		help
	@@ -633,6 +639,8 @@ config ARCH_TEGRA
	select GENERIC_GPIO		select GENERIC_GPIO
	select HAVE_CLK		select HAVE_CLK
	select HAVE_SCHED_CLOCK		select HAVE_SCHED_CLOCK
			select HAVE_SMP
			select MIGHT_HAVE_CACHE_L2X0
	select ARCH_HAS_CPUFREQ		select ARCH_HAS_CPUFREQ
	help		help
	This enables support for NVIDIA Tegra based systems (Tegra APX,		This enables support for NVIDIA Tegra based systems (Tegra APX,
	@@ -702,7 +710,9 @@ config ARCH_SHMOBILE
	select HAVE_CLK		select HAVE_CLK
	select CLKDEV_LOOKUP		select CLKDEV_LOOKUP
	select HAVE_MACH_CLKDEV		select HAVE_MACH_CLKDEV
			select HAVE_SMP
	select GENERIC_CLOCKEVENTS		select GENERIC_CLOCKEVENTS
			select MIGHT_HAVE_CACHE_L2X0
	select NO_IOPORT		select NO_IOPORT
	select SPARSE_IRQ		select SPARSE_IRQ
	select MULTI_IRQ_HANDLER		select MULTI_IRQ_HANDLER
	@@ -867,16 +877,6 @@ config ARCH_SHARK
	Support for the StrongARM based Digital DNARD machine, also known		Support for the StrongARM based Digital DNARD machine, also known
	as "Shark" (<http://www.shark-linux.de/shark.html>).		as "Shark" (<http://www.shark-linux.de/shark.html>).

	config ARCH_TCC_926
	bool "Telechips TCC ARM926-based systems"
	select CLKSRC_MMIO
	select CPU_ARM926T
	select HAVE_CLK
	select CLKDEV_LOOKUP
	select GENERIC_CLOCKEVENTS
	help
	Support for Telechips TCC ARM926-based systems.

	config ARCH_U300		config ARCH_U300
	bool "ST-Ericsson U300 Series"		bool "ST-Ericsson U300 Series"
	depends on MMU		depends on MMU
	@@ -904,6 +904,8 @@ config ARCH_U8500
	select CLKDEV_LOOKUP		select CLKDEV_LOOKUP
	select ARCH_REQUIRE_GPIOLIB		select ARCH_REQUIRE_GPIOLIB
	select ARCH_HAS_CPUFREQ		select ARCH_HAS_CPUFREQ
			select HAVE_SMP
			select MIGHT_HAVE_CACHE_L2X0
	help		help
	Support for ST-Ericsson's Ux500 architecture		Support for ST-Ericsson's Ux500 architecture

	@@ -914,6 +916,7 @@ config ARCH_NOMADIK
	select CPU_ARM926T		select CPU_ARM926T
	select CLKDEV_LOOKUP		select CLKDEV_LOOKUP
	select GENERIC_CLOCKEVENTS		select GENERIC_CLOCKEVENTS
			select MIGHT_HAVE_CACHE_L2X0
	select ARCH_REQUIRE_GPIOLIB		select ARCH_REQUIRE_GPIOLIB
	help		help
	Support for the Nomadik platform by ST-Ericsson		Support for the Nomadik platform by ST-Ericsson
	@@ -973,6 +976,7 @@ config ARCH_ZYNQ
	select ARM_GIC		select ARM_GIC
	select ARM_AMBA		select ARM_AMBA
	select ICST		select ICST
			select MIGHT_HAVE_CACHE_L2X0
	select USE_OF		select USE_OF
	help		help
	Support for Xilinx Zynq ARM Cortex A9 Platform		Support for Xilinx Zynq ARM Cortex A9 Platform
	@@ -1059,8 +1063,6 @@ source "arch/arm/plat-s5p/Kconfig"

	source "arch/arm/plat-spear/Kconfig"		source "arch/arm/plat-spear/Kconfig"

	source "arch/arm/plat-tcc/Kconfig"

	if ARCH_S3C2410		if ARCH_S3C2410
	source "arch/arm/mach-s3c2410/Kconfig"		source "arch/arm/mach-s3c2410/Kconfig"
	source "arch/arm/mach-s3c2412/Kconfig"		source "arch/arm/mach-s3c2412/Kconfig"
	@@ -1125,6 +1127,11 @@ config ARM_TIMER_SP804

	source arch/arm/mm/Kconfig		source arch/arm/mm/Kconfig

			config ARM_NR_BANKS
			int
			default 16 if ARCH_EP93XX
			default 8

	config IWMMXT		config IWMMXT
	bool "Enable iWMMXt support"		bool "Enable iWMMXt support"
	depends on CPU_XSCALE \|\| CPU_XSC3 \|\| CPU_MOHAWK \|\| CPU_PJ4		depends on CPU_XSCALE \|\| CPU_XSC3 \|\| CPU_MOHAWK \|\| CPU_PJ4
	@@ -1245,7 +1252,7 @@ config PL310_ERRATA_588369

	config ARM_ERRATA_720789		config ARM_ERRATA_720789
	bool "ARM errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID"		bool "ARM errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID"
	depends on CPU_V7 && SMP		depends on CPU_V7
	help		help
	This option enables the workaround for the 720789 Cortex-A9 (prior to		This option enables the workaround for the 720789 Cortex-A9 (prior to
	r2p0) erratum. A faulty ASID can be sent to the other CPUs for the		r2p0) erratum. A faulty ASID can be sent to the other CPUs for the
	@@ -1281,7 +1288,7 @@ config ARM_ERRATA_743622

	config ARM_ERRATA_751472		config ARM_ERRATA_751472
	bool "ARM errata: Interrupted ICIALLUIS may prevent completion of broadcasted operation"		bool "ARM errata: Interrupted ICIALLUIS may prevent completion of broadcasted operation"
	depends on CPU_V7 && SMP		depends on CPU_V7
	help		help
	This option enables the workaround for the 751472 Cortex-A9 (prior		This option enables the workaround for the 751472 Cortex-A9 (prior
	to r3p0) erratum. An interrupted ICIALLUIS operation may prevent the		to r3p0) erratum. An interrupted ICIALLUIS operation may prevent the
	@@ -1434,14 +1441,20 @@ menu "Kernel Features"

	source "kernel/time/Kconfig"		source "kernel/time/Kconfig"

			config HAVE_SMP
			bool
			help
			This option should be selected by machines which have an SMP-
			capable CPU.

			The only effect of this option is to make the SMP-related
			options available to the user for configuration.

	config SMP		config SMP
	bool "Symmetric Multi-Processing"		bool "Symmetric Multi-Processing"
	depends on CPU_V6K \|\| CPU_V7		depends on CPU_V6K \|\| CPU_V7
	depends on GENERIC_CLOCKEVENTS		depends on GENERIC_CLOCKEVENTS
	depends on REALVIEW_EB_ARM11MP \|\| REALVIEW_EB_A9MP \|\| \		depends on HAVE_SMP
	MACH_REALVIEW_PB11MP \|\| MACH_REALVIEW_PBX \|\| ARCH_OMAP4 \|\| \
	ARCH_EXYNOS4 \|\| ARCH_TEGRA \|\| ARCH_U8500 \|\| ARCH_VEXPRESS_CA9X4 \|\| \
	ARCH_MSM_SCORPIONMP \|\| ARCH_SHMOBILE \|\| ARCH_HIGHBANK \|\| SOC_IMX6Q
	depends on MMU		depends on MMU
	select USE_GENERIC_SMP_HELPERS		select USE_GENERIC_SMP_HELPERS
	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP		select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
	@@ -1559,6 +1572,16 @@ config LOCAL_TIMERS
	accounting to be spread across the timer interval, preventing a		accounting to be spread across the timer interval, preventing a
	"thundering herd" at every timer tick.		"thundering herd" at every timer tick.

			config ARCH_NR_GPIO
			int
			default 1024 if ARCH_SHMOBILE \|\| ARCH_TEGRA
			default 350 if ARCH_U8500
			default 0
			help
			Maximum number of GPIOs in the system.

			If unsure, leave the default value.

	source kernel/Kconfig.preempt		source kernel/Kconfig.preempt

	config HZ		config HZ