]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agomm: remove free_area_cache use in powerpc architecture
Michel Lespinasse [Tue, 26 Mar 2013 23:24:05 +0000 (10:24 +1100)]
mm: remove free_area_cache use in powerpc architecture

As all other architectures have been converted to use vm_unmapped_area(),
we are about to retire the free_area_cache.

This change simply removes the use of that cache in
slice_get_unmapped_area(), which will most certainly have a
performance cost. Next one will convert that function to use the
vm_unmapped_area() infrastructure and regain the performance.

Signed-off-by: Michel Lespinasse <walken@google.com>
Acked-by: Rik van Riel <riel@redhat.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agox86: make 'mem=' option to work for efi platform
Wen Congyang [Tue, 26 Mar 2013 23:24:04 +0000 (10:24 +1100)]
x86: make 'mem=' option to work for efi platform

Current mem boot option only can work for non efi environment.  If the
user specifies add_efi_memmap, it cannot work for efi environment.  In the
efi environment, we call e820_add_region() to add the memory map.  So we
can modify __e820_add_region() and the mem boot option can work for efi
environment.

Note: Only E820_RAM is limited, and BOOT_SERVICES_{CODE,DATA} are always
mapped(If its address >= mem_limit, the memory won't be freed in
efi_free_boot_services()).

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: Matt Fleming <matt.fleming@intel.com>
Cc: Rob Landley <rob@landley.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Yasuaki ISIMATU <isimatu.yasuaki@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agoarch/x86/mm/init_64.c: fix build warning when CONFIG_MEMORY_HOTREMOVE=n
Jianguo Wu [Tue, 26 Mar 2013 23:24:04 +0000 (10:24 +1100)]
arch/x86/mm/init_64.c: fix build warning when CONFIG_MEMORY_HOTREMOVE=n

There is a warning while building kernel with
CONFIG_MEMORY_HOTPLUG=y && CONFIG_MEMORY_HOTREMOVE=n:
arch/x86/mm/init_64.c:1024: warning:kernel_physical_mapping_remove defined but not used

So move kernel_physical_mapping_remove() into "#ifdef
CONFIG_MEMORY_HOTREMOVE" block

Signed-off-by: Jianguo Wu <wujianguo@huawei.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Liujiang <jiang.liu@huawei.com>
Cc: qiuxishi <qiuxishi@huawei.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agokthread: kill task_get_live_kthread()
Oleg Nesterov [Tue, 26 Mar 2013 23:24:03 +0000 (10:24 +1100)]
kthread: kill task_get_live_kthread()

task_get_live_kthread() looks confusing and unneeded.  It does
get_task_struct() but only kthread_stop() needs this, it can be called
even if the calller doesn't have a reference when we know that this
kthread can't exit until we do kthread_stop().

kthread_park() and kthread_unpark() do not need get_task_struct(), the
callers already have the reference.  And it can not help if we can race
with the exiting kthread anyway, kthread_park() can hang forever in this
case.

Change kthread_park() and kthread_unpark() to use to_live_kthread(),
change kthread_stop() to do get_task_struct() by hand and remove
task_get_live_kthread().

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agokthread: introduce to_live_kthread()
Oleg Nesterov [Tue, 26 Mar 2013 23:24:03 +0000 (10:24 +1100)]
kthread: introduce to_live_kthread()

"k->vfork_done != NULL" with a barrier() after to_kthread(k) in
task_get_live_kthread(k) looks unclear, and sub-optimal because we load
->vfork_done twice.

All we need is to ensure that we do not return to_kthread(NULL).  Add a
new trivial helper which loads/checks ->vfork_done once, this also looks
more understandable.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agodrivers/char/random.c: fix priming of last_data
Jarod Wilson [Tue, 26 Mar 2013 23:24:03 +0000 (10:24 +1100)]
drivers/char/random.c: fix priming of last_data

Commit ec8f02da9e ("random: prime last_data value per fips requirements")
added priming of last_data per fips requirements.  Unfortuantely, it did
so in a way that can lead to multiple threads all incrementing nbytes, but
only one actually doing anything with the extra data, which leads to some
fun random corruption and panics.

The fix is to simply do everything needed to prime last_data in a single
shot, so there's no window for multiple cpus to increment nbytes -- in
fact, we won't even increment or decrement nbytes anymore, we'll just
extract the needed EXTRACT_SIZE one time per pool and then carry on with
the normal routine.

All these changes have been tested across multiple hosts and architectures
where panics were previously encoutered.  The code changes are are
strictly limited to areas only touched when when booted in fips mode.

This change should also go into 3.8-stable, to make the myriads of fips
users on 3.8.x happy.

Signed-off-by: Jarod Wilson <jarod@redhat.com>
Tested-by: Jan Stancek <jstancek@redhat.com>
Tested-by: Jan Stodola <jstodola@redhat.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Matt Mackall <mpm@selenic.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agomips: define KVM_USER_MEM_SLOTS
Sanjay Lal [Tue, 26 Mar 2013 23:24:02 +0000 (10:24 +1100)]
mips: define KVM_USER_MEM_SLOTS

ARCH=mips, config=fuloong2e_defconfig:

akpm3:/usr/src/25> make arch/mips/kernel/early_printk.o
...
CC      arch/mips/kernel/asm-offsets.s
In file included from arch/mips/kernel/asm-offsets.c:20:
include/linux/kvm_host.h:334: error: `KVM_USER_MEM_SLOTS' undeclared here (not in a function)

Signed-off-by: Sanjay Lal <sanjayl@kymasys.com>
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agothinkpad-acpi: kill hotkey_thread_mutex
Oleg Nesterov [Tue, 26 Mar 2013 23:24:02 +0000 (10:24 +1100)]
thinkpad-acpi: kill hotkey_thread_mutex

hotkey_kthread() does try_to_freeze() under hotkey_thread_mutex.

We can simply kill this mutex, hotkey_poll_stop_sync() does not need to
serialize with hotkey_kthread().  When kthread_stop() returns the thread
is already dead, it called do_exit()->complete_vfork_done().

Reported-by: Artem Savkov <artem.savkov@gmail.com>
Reported-by: Maciej Rutecki <maciej.rutecki@gmail.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Matthew Garrett <matthew.garrett@nebula.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Reviewed-by: Mandeep Singh Baines <msb@chromium.org>
Cc: Aaron Lu <aaron.lu@intel.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agorevert "ipc: don't allocate a copy larger than max"
Andrew Morton [Tue, 26 Mar 2013 23:24:02 +0000 (10:24 +1100)]
revert "ipc: don't allocate a copy larger than max"

Revert 88b9e456b164.  Dave has confirmed that this was causing oopses
during trinity testing.

Cc: Peter Hurley <peter@hurleysoftware.com>
Cc: Stanislav Kinsbursky <skinsbursky@parallels.com>
Reported-by: Dave Jones <davej@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agoMerge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Thu, 4 Apr 2013 05:50:44 +0000 (16:50 +1100)]
Merge remote-tracking branch 'lzo-update/lzo-update'

11 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Thu, 4 Apr 2013 05:49:09 +0000 (16:49 +1100)]
Merge remote-tracking branch 'clk/clk-next'

11 years agoMerge remote-tracking branch 'signal/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 05:41:25 +0000 (16:41 +1100)]
Merge remote-tracking branch 'signal/for-next'

Conflicts:
arch/mips/kernel/linux32.c
arch/tile/Kconfig
arch/tile/kernel/compat.c
fs/compat.c
fs/read_write.c
fs/read_write.h
fs/splice.c
include/asm-generic/unistd.h

11 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 05:25:43 +0000 (16:25 +1100)]
Merge remote-tracking branch 'userns/for-next'

11 years agoMerge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 05:24:10 +0000 (16:24 +1100)]
Merge remote-tracking branch 'pwm/for-next'

11 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 05:22:35 +0000 (16:22 +1100)]
Merge remote-tracking branch 'tegra/for-next'

Conflicts:
arch/arm/mach-tegra/tegra.c
drivers/clocksource/tegra20_timer.c

11 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 05:20:58 +0000 (16:20 +1100)]
Merge remote-tracking branch 'samsung/for-next'

11 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Thu, 4 Apr 2013 05:20:50 +0000 (16:20 +1100)]
Merge remote-tracking branch 'renesas/next'

11 years agoMerge remote-tracking branch 'msm/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 05:19:19 +0000 (16:19 +1100)]
Merge remote-tracking branch 'msm/for-next'

11 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 05:17:41 +0000 (16:17 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
arch/arm/Kconfig.debug
arch/arm/mach-imx/cpufreq.c
drivers/clocksource/Makefile

11 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Thu, 4 Apr 2013 05:11:09 +0000 (16:11 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

11 years agoMerge remote-tracking branch 'bcm2835/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 05:09:34 +0000 (16:09 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig.debug

11 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 05:03:01 +0000 (16:03 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

11 years agoMerge remote-tracking branch 'mailbox/dbx500-prcmu-mailbox'
Stephen Rothwell [Thu, 4 Apr 2013 05:01:31 +0000 (16:01 +1100)]
Merge remote-tracking branch 'mailbox/dbx500-prcmu-mailbox'

11 years agoMerge remote-tracking branch 'gen-gpio/for_next'
Stephen Rothwell [Thu, 4 Apr 2013 04:59:58 +0000 (15:59 +1100)]
Merge remote-tracking branch 'gen-gpio/for_next'

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile

11 years agoMerge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 04:58:26 +0000 (15:58 +1100)]
Merge remote-tracking branch 'gpio-lw/for-next'

11 years agoMerge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Thu, 4 Apr 2013 04:56:56 +0000 (15:56 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'

11 years agoMerge remote-tracking branch 'irqdomain/irqdomain/next'
Stephen Rothwell [Thu, 4 Apr 2013 04:55:25 +0000 (15:55 +1100)]
Merge remote-tracking branch 'irqdomain/irqdomain/next'

11 years agoMerge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Thu, 4 Apr 2013 04:53:46 +0000 (15:53 +1100)]
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/vhost/Makefile

11 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 04:52:02 +0000 (15:52 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'

11 years agoMerge remote-tracking branch 'bcon/master'
Stephen Rothwell [Thu, 4 Apr 2013 04:49:50 +0000 (15:49 +1100)]
Merge remote-tracking branch 'bcon/master'

Conflicts:
drivers/block/Kconfig

11 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Thu, 4 Apr 2013 04:45:09 +0000 (15:45 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'

11 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Thu, 4 Apr 2013 04:43:21 +0000 (15:43 +1100)]
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/ccg/f_fs.c
drivers/staging/ccg/rndis.c
drivers/staging/dgrp/dgrp_dpa_ops.c
drivers/staging/dgrp/dgrp_mon_ops.c
drivers/staging/dgrp/dgrp_net_ops.c
drivers/staging/dgrp/dgrp_ports_ops.c
drivers/staging/dgrp/dgrp_specproc.c

11 years agoMerge remote-tracking branch 'usb-gadget/next'
Stephen Rothwell [Thu, 4 Apr 2013 04:18:23 +0000 (15:18 +1100)]
Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/chipidea/udc.c
drivers/usb/gadget/net2272.c
drivers/usb/gadget/net2280.c
drivers/usb/host/ehci-tegra.c

11 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:53:45 +0000 (14:53 +1100)]
Merge remote-tracking branch 'usb/usb-next'

Conflicts:
drivers/usb/serial/usb-serial.c

11 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:52:00 +0000 (14:52 +1100)]
Merge remote-tracking branch 'tty/tty-next'

11 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:45:07 +0000 (14:45 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'

11 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:43:18 +0000 (14:43 +1100)]
Merge remote-tracking branch 'leds/for-next'

11 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:41:34 +0000 (14:41 +1100)]
Merge remote-tracking branch 'regmap/for-next'

11 years agoMerge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:41:21 +0000 (14:41 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'

Conflicts:
drivers/platform/x86/chromeos_laptop.c

11 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:39:47 +0000 (14:39 +1100)]
Merge remote-tracking branch 'workqueues/for-next'

11 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:38:18 +0000 (14:38 +1100)]
Merge remote-tracking branch 'percpu/for-next'

11 years agoMerge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:31:51 +0000 (14:31 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'

11 years agoMerge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:30:12 +0000 (14:30 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

11 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:28:35 +0000 (14:28 +1100)]
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
drivers/s390/kvm/virtio_ccw.c

11 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 4 Apr 2013 03:21:00 +0000 (14:21 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'

11 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:13:29 +0000 (14:13 +1100)]
Merge remote-tracking branch 'ftrace/for-next'

Conflicts:
kernel/trace/ftrace.c

11 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Thu, 4 Apr 2013 03:06:13 +0000 (14:06 +1100)]
Merge remote-tracking branch 'tip/auto-latest'

11 years agoMerge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:04:27 +0000 (14:04 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'

11 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:55:36 +0000 (13:55 +1100)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/virtual/virtio-spec.txt

11 years agoMerge remote-tracking branch 'vfio/next'
Stephen Rothwell [Thu, 4 Apr 2013 02:50:15 +0000 (13:50 +1100)]
Merge remote-tracking branch 'vfio/next'

11 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 4 Apr 2013 02:48:45 +0000 (13:48 +1100)]
Merge remote-tracking branch 'iommu/next'

11 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 4 Apr 2013 02:47:11 +0000 (13:47 +1100)]
Merge remote-tracking branch 'watchdog/master'

11 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Thu, 4 Apr 2013 02:47:03 +0000 (13:47 +1100)]
Merge remote-tracking branch 'selinux/master'

11 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 4 Apr 2013 02:42:09 +0000 (13:42 +1100)]
Merge remote-tracking branch 'security/next'

11 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:40:34 +0000 (13:40 +1100)]
Merge remote-tracking branch 'regulator/for-next'

11 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:39:05 +0000 (13:39 +1100)]
Merge remote-tracking branch 'omap_dss2/for-next'

11 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 4 Apr 2013 02:37:28 +0000 (13:37 +1100)]
Merge remote-tracking branch 'battery/master'

11 years agoMerge remote-tracking branch 'mfd/master'
Stephen Rothwell [Thu, 4 Apr 2013 02:35:59 +0000 (13:35 +1100)]
Merge remote-tracking branch 'mfd/master'

11 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:34:27 +0000 (13:34 +1100)]
Merge remote-tracking branch 'md/for-next'

11 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:27:12 +0000 (13:27 +1100)]
Merge remote-tracking branch 'slab/for-next'

11 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:27:08 +0000 (13:27 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

11 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:25:36 +0000 (13:25 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

11 years agoMerge branch 'device-mapper/master'
Stephen Rothwell [Thu, 4 Apr 2013 02:23:54 +0000 (13:23 +1100)]
Merge branch 'device-mapper/master'

11 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:16:20 +0000 (13:16 +1100)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
drivers/block/drbd/drbd_proc.c

11 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 01:33:38 +0000 (12:33 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
include/linux/res_counter.h

11 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 4 Apr 2013 01:26:42 +0000 (12:26 +1100)]
Merge remote-tracking branch 'input/next'

11 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Thu, 4 Apr 2013 01:21:15 +0000 (12:21 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

Conflicts:
drivers/char/virtio_console.c

11 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 4 Apr 2013 01:13:45 +0000 (12:13 +1100)]
Merge remote-tracking branch 'modules/modules-next'

11 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 01:12:04 +0000 (12:12 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

11 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 01:10:21 +0000 (12:10 +1100)]
Merge remote-tracking branch 'sound/for-next'

11 years agoMerge remote-tracking branch 'drm-intel/drm-intel-next-queued'
Stephen Rothwell [Thu, 4 Apr 2013 01:03:00 +0000 (12:03 +1100)]
Merge remote-tracking branch 'drm-intel/drm-intel-next-queued'

11 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 4 Apr 2013 01:01:27 +0000 (12:01 +1100)]
Merge remote-tracking branch 'crypto/master'

11 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:59:54 +0000 (11:59 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

11 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:58:23 +0000 (11:58 +1100)]
Merge remote-tracking branch 'bluetooth/master'

11 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:56:26 +0000 (11:56 +1100)]
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/nfc/microread/mei.c
net/mac80211/sta_info.c
net/wireless/core.h

11 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:48:35 +0000 (11:48 +1100)]
Merge remote-tracking branch 'ipsec-next/master'

11 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:40:47 +0000 (11:40 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
drivers/nfc/microread/mei.c

11 years agoMerge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Thu, 4 Apr 2013 00:32:27 +0000 (11:32 +1100)]
Merge remote-tracking branch 'dmaengine/next'

Conflicts:
drivers/dma/ioat/dma_v3.c

11 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 4 Apr 2013 00:28:25 +0000 (11:28 +1100)]
Merge remote-tracking branch 'slave-dma/next'

11 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 00:26:47 +0000 (11:26 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

11 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 4 Apr 2013 00:25:00 +0000 (11:25 +1100)]
Merge remote-tracking branch 'thermal/next'

11 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Thu, 4 Apr 2013 00:24:51 +0000 (11:24 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/base/power/qos.c

11 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Thu, 4 Apr 2013 00:23:19 +0000 (11:23 +1100)]
Merge remote-tracking branch 'idle/next'

11 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 4 Apr 2013 00:21:24 +0000 (11:21 +1100)]
Merge remote-tracking branch 'pm/linux-next'

11 years agoMerge remote-tracking branch 'pstore/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:19:55 +0000 (11:19 +1100)]
Merge remote-tracking branch 'pstore/master'

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 00:18:10 +0000 (11:18 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:16:14 +0000 (11:16 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
drivers/media/pci/bt8xx/bttv-input.c
drivers/media/platform/Kconfig
drivers/staging/media/go7007/go7007-driver.c

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 4 Apr 2013 00:14:48 +0000 (11:14 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:13:24 +0000 (11:13 +1100)]
Merge branch 'jdelvare-hwmon/master'

11 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 00:11:08 +0000 (11:11 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'

11 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 00:09:38 +0000 (11:09 +1100)]
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-multitouch.c

11 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Thu, 4 Apr 2013 00:06:21 +0000 (11:06 +1100)]
Merge remote-tracking branch 'pci/next'

11 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:59:27 +0000 (10:59 +1100)]
Merge remote-tracking branch 'vfs/for-next'

11 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:57:58 +0000 (10:57 +1100)]
Merge remote-tracking branch 'xfs/for-next'

Conflicts:
fs/xfs/xfs_iomap.c

11 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:56:33 +0000 (10:56 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

11 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:54:41 +0000 (10:54 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

11 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:53:15 +0000 (10:53 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:51:43 +0000 (10:51 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 3 Apr 2013 23:50:05 +0000 (10:50 +1100)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:48:40 +0000 (10:48 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'