Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio/next (fda87903) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/ABI/testing/sysfs-bus-rbd

+0 −7

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

		$ 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_*

		A directory per each snapshot

MAINTAINERS

+11 −4

Original line number	Diff line number	Diff line
		@@ -3102,6 +3102,7 @@ F: include/linux/hid*

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

		ISAPNP
		@@ -4099,7 +4100,7 @@ F: drivers/hwmon/lm90.c
		LOCKDEP AND LOCKSTAT
		M: Peter Zijlstra <peterz@infradead.org>
		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
		F: Documentation/lockdep*.txt
		F: Documentation/lockstat.txt
		@@ -4281,7 +4282,9 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
		S: Maintained
		F: Documentation/dvb/
		F: Documentation/video4linux/
		F: Documentation/DocBook/media/
		F: drivers/media/
		F: drivers/staging/media/
		F: include/media/
		F: include/linux/dvb/
		F: include/linux/videodev*.h
		@@ -5087,6 +5090,7 @@ M: Peter Zijlstra <a.p.zijlstra@chello.nl>
		M: Paul Mackerras <paulus@samba.org>
		M: Ingo Molnar <mingo@elte.hu>
		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
		F: kernel/events/*
		F: include/linux/perf_event.h
		@@ -5166,6 +5170,7 @@ F: drivers/scsi/pm8001/

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

Makefile

+1 −1

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

		# DOCUMENTATION

arch/arm/Kconfig

+2 −1

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

		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
		default DRAM_BASE if !MMU
		help
		Please provide the physical address corresponding to the
		location of main memory in your system.

arch/arm/include/asm/unwind.h

+4 −12

Original line number	Diff line number	Diff line
		@@ -30,14 +30,15 @@ enum unwind_reason_code {
		};

		struct unwind_idx {
		unsigned long addr;
		unsigned long addr_offset;
		unsigned long insn;
		};

		struct unwind_table {
		struct list_head list;
		struct unwind_idx *start;
		struct unwind_idx *stop;
		const struct unwind_idx *start;
		const struct unwind_idx *origin;
		const struct unwind_idx *stop;
		unsigned long begin_addr;
		unsigned long end_addr;
		};
		@@ -49,15 +50,6 @@ extern struct unwind_table *unwind_table_add(unsigned long start,
		extern void unwind_table_del(struct unwind_table *tab);
		extern void unwind_backtrace(struct pt_regs regs, struct task_struct tsk);

		#ifdef CONFIG_ARM_UNWIND
		extern int __init unwind_init(void);
		#else
		static inline int __init unwind_init(void)
		{
		return 0;
		}
		#endif

		#endif /* !__ASSEMBLY__ */

		#ifdef CONFIG_ARM_UNWIND