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

Commit 40ba95fd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'depends/rmk/restart' into next/cleanup 



Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-exynos/cpu.c
	arch/arm/mach-shmobile/board-kota2.c

This resolves a bunch of conflicts between the arm-soc tree
and changes from the arm tree that have gone upstream.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 70d84a64 0575fb75

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

MAINTAINERS

+11 −11
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)
@@ -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
@@ -5174,6 +5171,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*
@@ -5689,6 +5687,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
@@ -5713,6 +5712,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
@@ -6640,7 +6640,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
@@ -7390,7 +7390,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

+2 −13
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.
@@ -868,16 +869,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
@@ -1059,8 +1050,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"

arch/arm/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -184,7 +184,6 @@ machine-$(CONFIG_ARCH_EXYNOS4) := exynos 
machine-$(CONFIG_ARCH_SA1100)		:= sa1100

machine-$(CONFIG_ARCH_SA1100)		:= sa1100

machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile

machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile

machine-$(CONFIG_ARCH_TCC8K)		:= tcc8k

machine-$(CONFIG_ARCH_TEGRA)		:= tegra

machine-$(CONFIG_ARCH_TEGRA)		:= tegra

machine-$(CONFIG_ARCH_U300)		:= u300

machine-$(CONFIG_ARCH_U300)		:= u300

machine-$(CONFIG_ARCH_U8500)		:= ux500

machine-$(CONFIG_ARCH_U8500)		:= ux500
@@ -204,7 +203,6 @@ machine-$(CONFIG_ARCH_ZYNQ) := zynq 
plat-$(CONFIG_ARCH_MXC)		:= mxc

plat-$(CONFIG_ARCH_MXC)		:= mxc

plat-$(CONFIG_ARCH_OMAP)	:= omap

plat-$(CONFIG_ARCH_OMAP)	:= omap

plat-$(CONFIG_ARCH_S3C64XX)	:= samsung

plat-$(CONFIG_ARCH_S3C64XX)	:= samsung

plat-$(CONFIG_ARCH_TCC_926)	:= tcc

plat-$(CONFIG_ARCH_ZYNQ)	:= versatile

plat-$(CONFIG_ARCH_ZYNQ)	:= versatile

plat-$(CONFIG_PLAT_IOP)		:= iop

plat-$(CONFIG_PLAT_IOP)		:= iop

plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik

plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik