Linus Torvalds
26ff6801f7
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
...
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: DT: Cleanup namespace and call irq_set_irq_type() unconditional
x86: DT: Fix return condition in irq_create_of_mapping()
x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context
2011-03-25 17:51:51 -07:00
Linus Torvalds
ffbf0ab1a6
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: merge m68k and m68knommu arch directories
2011-03-25 17:47:58 -07:00
Linus Torvalds
73939bb56a
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
...
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc32: Fix multiple RTC detections on SUN4D
2011-03-25 17:47:38 -07:00
Linus Torvalds
7c8d891c2c
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
...
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] cmpxchg: implement cmpxchg64()
[S390] xchg/cmpxchg: move to own header file
[S390] ccwgroup_driver: remove duplicate members
[S390] ccw_bus_type: make it static
[S390] ccw_driver: remove duplicate members
[S390] qdio: prevent handling of buffers if count is zero
[S390] setup: register bss section as resource
[S390] setup: simplify setup_resources()
[S390] wire up sys_syncfs
[S390] wire up sys_clock_adjtime
[S390] wire up sys_open_by_handle_at
[S390] wire up sys_name_to_handle_at
[S390] oprofile: disable hw sampling for CONFIG_32BIT
[S390] early: limit savesys cmd string handling
[S390] early: Fix possible overlapping data buffer
2011-03-25 17:47:04 -07:00
Linus Torvalds
62d0086751
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
...
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (49 commits)
MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board
MIPS: JZ4740: qi_lb60: Add gpio-charger device
MIPS: Wire up syncfs(2).
MIPS: Hook up name_to_handle_at, open_by_handle_at and clock_adjtime syscalls.
MIPS: VR41xx: Convert to new irq_chip functions
MIPS: TXx9: Convert to new irq_chip functions
MIPS: SNI: Convert to new irq_chip functions
MIPS: Sibyte: Convert to new irq_chip functions
MIPS: IP32: Convert to new irq_chip functions
MIPS: IP27: Convert to new irq_chip functions
MIPS: IP22/IP28: Convert to new irq_chip functions
MIPS: RB532: Convert to new irq_chip functions
MIPS: PowerTV: Convert to new irq_chip functions
MIPS: PNX8550: Convert to new irq_chip functions
MIPS: PNX83xx: Convert to new irq_chip functions
MIPS: msp71xx: Convert to new irq_chip functions
MIPS: Loongson: Convert to new irq_chip functions
MIPS: Use generic show_interrupts()
MIPS: SMTC: Cleanup the hook mess and use irq_data
MIPS: SMTC: Use irq_data in smtc_forward_irq()
...
2011-03-25 17:46:34 -07:00
Xiaotian Feng
be4d250ab4
ipcns: fix use after free in free_ipc_ns()
...
commit b515498 ("userns: add a user namespace owner of ipc ns") added a
user namespace owner of ipc ns, but it also introduced a use after free in
free_ipc_ns().
Signed-off-by: Xiaotian Feng <dfeng@redhat.com >
Acked-by: "Serge E. Hallyn" <serge.hallyn@canonical.com >
Acked-by: David Howells <dhowells@redhat.com >
Cc: "Eric W. Biederman" <ebiederm@xmission.com >
Cc: Daniel Lezcano <daniel.lezcano@free.fr >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2011-03-25 17:45:16 -07:00
Rakib Mullick
c03e3126e4
codafs: fix build break when CONFIG_PROC_SYSCTL=n
...
Commit 0bc825d240 ("codafs: fix compile warning when CONFIG_SYSCTL=n")
introduces build breakage, when CONFIG_PROC_SYSCTL=n and
CONFIG_CODA_FS=y:
fs/built-in.o: In function `init_coda':
psdev.c:(.init.text+0xc02): undefined reference to `coda_sysctl_init'
psdev.c:(.init.text+0xc7c): undefined reference to `coda_sysctl_clean'
fs/built-in.o: In function `exit_coda':
psdev.c:(.exit.text+0xa9): undefined reference to `coda_sysctl_clean'
make: *** [.tmp_vmlinux1] Error 1
Signed-off-by: Rakib Mullick <rakib.mullick@gmail.com >
Reported-by: Ingo Molnar <mingo@elte.hu >
Acked-by: Randy Dunlap <randy.dunlap@oracle.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2011-03-25 17:45:16 -07:00
Maxim Levitsky
9263412501
memstick: add driver for Ricoh R5C592 card reader
...
Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com >
Acked-by: Alex Dubov <oakad@yahoo.com >
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2011-03-25 17:45:16 -07:00
Lars-Peter Clausen
c8fb4022cf
MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board
...
The jz4740 nand driver now requires that the ecc offsets are set.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/2058/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:21 +01:00
Lars-Peter Clausen
0b4cf1813f
MIPS: JZ4740: qi_lb60: Add gpio-charger device
...
Register the gpio-charger device which reports whether device is currently
charging or not.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/2059/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:21 +01:00
Ralf Baechle
1bbf287561
MIPS: Wire up syncfs(2).
...
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:20 +01:00
David Daney
84ed94323e
MIPS: Hook up name_to_handle_at, open_by_handle_at and clock_adjtime syscalls.
...
These system calls we recently added.
32-bit ABIs need compat handling for sys_clock_adjtime().
o32 also needs compat handling for sys_open_by_handle_at();
Signed-off-by: David Daney <ddaney@caviumnetworks.com >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2165/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:20 +01:00
Thomas Gleixner
fbaa4e2a19
MIPS: VR41xx: Convert to new irq_chip functions
...
And cleanup direct access to irq_desc[].
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2208/
Patchwork: https://patchwork.linux-mips.org/patch/2209/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:20 +01:00
Thomas Gleixner
d7ae7c7137
MIPS: TXx9: Convert to new irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2207/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:20 +01:00
Thomas Gleixner
0b888c7f3a
MIPS: SNI: Convert to new irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2206/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:20 +01:00
Thomas Gleixner
d6d5d5c4af
MIPS: Sibyte: Convert to new irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2205/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:19 +01:00
Thomas Gleixner
4d2796f836
MIPS: IP32: Convert to new irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2204/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:19 +01:00
Thomas Gleixner
301218df9c
MIPS: IP27: Convert to new irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2203/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:19 +01:00
Thomas Gleixner
9458ea567a
MIPS: IP22/IP28: Convert to new irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2202/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:19 +01:00
Thomas Gleixner
efb02da52f
MIPS: RB532: Convert to new irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2201/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:19 +01:00
Thomas Gleixner
2f8d36e711
MIPS: PowerTV: Convert to new irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2200/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:19 +01:00
Thomas Gleixner
0007b9bdbe
MIPS: PNX8550: Convert to new irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2199/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:19 +01:00
Thomas Gleixner
8fcc34e5ce
MIPS: PNX83xx: Convert to new irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2198/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:18 +01:00
Thomas Gleixner
d7881fbdf8
MIPS: msp71xx: Convert to new irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2197/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:18 +01:00
Thomas Gleixner
7ec8af9e34
MIPS: Loongson: Convert to new irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2196/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:18 +01:00