]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
9 years agooprofile-reduce-mmap_sem-hold-for-mm-exe_file-fix
Andrew Morton [Tue, 7 Apr 2015 23:57:05 +0000 (09:57 +1000)]
oprofile-reduce-mmap_sem-hold-for-mm-exe_file-fix

export get_mm_exe_file for arch/x86/oprofile/oprofile.ko

Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Davidlohr Bueso <dbueso@suse.de>
Cc: Robert Richter <rric@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agopowerpc/oprofile: reduce mmap_sem hold for exe_file
Davidlohr Bueso [Tue, 7 Apr 2015 23:57:05 +0000 (09:57 +1000)]
powerpc/oprofile: reduce mmap_sem hold for exe_file

In the future mm->exe_file will be done without mmap_sem serialization,
thus isolate and reorganize the related code to make the transition
easier.  Good users will, make use of the more standard get_mm_exe_file(),
requiring only holding the mmap_sem to read the value, and relying on
reference counting to make sure that the exe file won't dissappear
underneath us while getting the dcookie.

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Robert Richter <rric@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agooprofile: reduce mmap_sem hold for mm->exe_file
Davidlohr Bueso [Tue, 7 Apr 2015 23:57:05 +0000 (09:57 +1000)]
oprofile: reduce mmap_sem hold for mm->exe_file

sync_buffer() needs the mmap_sem for two distinct operations, both only
occurring upon user context switch handling:

 1) Dealing with the exe_file.

 2) Adding the dcookie data as we need to lookup the vma that
   backs it. This is done via add_sample() and add_data().

This patch isolates 1), for it will no longer need the mmap_sem for
serialization.  However, for now, make of the more standard
get_mm_exe_file(), requiring only holding the mmap_sem to read the value,
and relying on reference counting to make sure that the exe file won't
dissappear underneath us while doing the get dcookie.

As a consequence, for 2) we move the mmap_sem locking into where we really
need it, in lookup_dcookie().  The benefits are twofold: reduce mmap_sem
hold times, and cleaner code.

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Cc: Robert Richter <rric@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agomips: ip32: add platform data hooks to use DS1685 driver
Joshua Kinard [Tue, 7 Apr 2015 23:57:04 +0000 (09:57 +1000)]
mips: ip32: add platform data hooks to use DS1685 driver

This modifies the IP32 (SGI O2) platform and reset code to utilize the new
rtc-ds1685 driver.  The old mc146818rtc.h header is removed and ip32_defconfig
is updated as well.

Signed-off-by: Joshua Kinard <kumba@gentoo.org>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agolib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
Andrew Morton [Tue, 7 Apr 2015 23:57:04 +0000 (09:57 +1000)]
lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text

Cc: Yalin Wang <yalin.wang@sonymobile.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agoarch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR
Masanari Iida [Tue, 7 Apr 2015 23:57:04 +0000 (09:57 +1000)]
arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agoMerge branch 'akpm-current/current'
Stephen Rothwell [Thu, 9 Apr 2015 08:53:01 +0000 (18:53 +1000)]
Merge branch 'akpm-current/current'

Conflicts:
Documentation/printk-formats.txt
arch/arm64/Kconfig
arch/parisc/include/asm/Kbuild
arch/s390/mm/mmap.c
drivers/rtc/class.c
drivers/rtc/rtc-mc13xxx.c
fs/ext2/file.c
fs/ext4/file.c
fs/fat/inode.c

9 years agoMerge remote-tracking branch 'livepatching/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:30:33 +0000 (18:30 +1000)]
Merge remote-tracking branch 'livepatching/for-next'

Conflicts:
arch/s390/Kconfig

9 years agoMerge remote-tracking branch 'y2038/y2038'
Stephen Rothwell [Thu, 9 Apr 2015 08:28:53 +0000 (18:28 +1000)]
Merge remote-tracking branch 'y2038/y2038'

Conflicts:
drivers/staging/media/lirc/lirc_parallel.c

9 years agoMerge remote-tracking branch 'kselftest/next'
Stephen Rothwell [Thu, 9 Apr 2015 08:27:46 +0000 (18:27 +1000)]
Merge remote-tracking branch 'kselftest/next'

Conflicts:
tools/testing/selftests/powerpc/Makefile

9 years agoMerge remote-tracking branch 'llvmlinux/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:27:39 +0000 (18:27 +1000)]
Merge remote-tracking branch 'llvmlinux/for-next'

9 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:26:04 +0000 (18:26 +1000)]
Merge remote-tracking branch 'clk/clk-next'

9 years agoMerge remote-tracking branch 'dma-buf/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:24:23 +0000 (18:24 +1000)]
Merge remote-tracking branch 'dma-buf/for-next'

9 years agoMerge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:22:58 +0000 (18:22 +1000)]
Merge remote-tracking branch 'pwm/for-next'

9 years agoMerge remote-tracking branch 'dma-mapping/dma-mapping-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:14:07 +0000 (18:14 +1000)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'

9 years agoMerge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:12:15 +0000 (18:12 +1000)]
Merge remote-tracking branch 'gpio/for-next'

9 years agoMerge remote-tracking branch 'remoteproc/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:11:11 +0000 (18:11 +1000)]
Merge remote-tracking branch 'remoteproc/for-next'

9 years agoMerge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:06:24 +0000 (18:06 +1000)]
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/usb/dwc3/dwc3-pci.c

9 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:01:05 +0000 (18:01 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'

9 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:59:53 +0000 (17:59 +1000)]
Merge remote-tracking branch 'target-updates/for-next'

9 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:48:08 +0000 (17:48 +1000)]
Merge remote-tracking branch 'scsi/for-next'

9 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:35:35 +0000 (17:35 +1000)]
Merge remote-tracking branch 'cgroup/for-next'

9 years agoMerge remote-tracking branch 'kdbus/kdbus'
Stephen Rothwell [Thu, 9 Apr 2015 07:22:55 +0000 (17:22 +1000)]
Merge remote-tracking branch 'kdbus/kdbus'

Conflicts:
Documentation/Makefile

9 years agoMerge remote-tracking branch 'extcon/extcon-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:21:49 +0000 (17:21 +1000)]
Merge remote-tracking branch 'extcon/extcon-next'

9 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:10:26 +0000 (17:10 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'

9 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:08:15 +0000 (17:08 +1000)]
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/media/mn88473/mn88473.c

9 years agoMerge remote-tracking branch 'usb-gadget/next'
Stephen Rothwell [Thu, 9 Apr 2015 07:05:43 +0000 (17:05 +1000)]
Merge remote-tracking branch 'usb-gadget/next'

9 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:01:01 +0000 (17:01 +1000)]
Merge remote-tracking branch 'usb/usb-next'

9 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:59:00 +0000 (16:59 +1000)]
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/dma/Kconfig

9 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:45:59 +0000 (16:45 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'

9 years agoMerge remote-tracking branch 'ipmi/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:44:58 +0000 (16:44 +1000)]
Merge remote-tracking branch 'ipmi/for-next'

9 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:42:41 +0000 (16:42 +1000)]
Merge remote-tracking branch 'leds/for-next'

9 years agoMerge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:41:39 +0000 (16:41 +1000)]
Merge remote-tracking branch 'hsi/for-next'

9 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:40:14 +0000 (16:40 +1000)]
Merge remote-tracking branch 'regmap/for-next'

9 years agoMerge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:39:07 +0000 (16:39 +1000)]
Merge remote-tracking branch 'chrome-platform/for-next'

9 years agoMerge remote-tracking branch 'drivers-x86/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:38:05 +0000 (16:38 +1000)]
Merge remote-tracking branch 'drivers-x86/for-next'

9 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:25:21 +0000 (16:25 +1000)]
Merge remote-tracking branch 'workqueues/for-next'

9 years agoMerge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:15:22 +0000 (16:15 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'

Conflicts:
drivers/xen/Kconfig

9 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:02:39 +0000 (16:02 +1000)]
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/mips/kernel/genex.S

9 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 9 Apr 2015 05:49:11 +0000 (15:49 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'

9 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 05:37:20 +0000 (15:37 +1000)]
Merge remote-tracking branch 'ftrace/for-next'

9 years agoMerge remote-tracking branch 'irqchip/irqchip/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 05:27:37 +0000 (15:27 +1000)]
Merge remote-tracking branch 'irqchip/irqchip/for-next'

Conflicts:
arch/arm/mach-exynos/suspend.c

9 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 05:26:18 +0000 (15:26 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'

9 years agoMerge remote-tracking branch 'clockevents/clockevents/next'
Stephen Rothwell [Thu, 9 Apr 2015 05:26:15 +0000 (15:26 +1000)]
Merge remote-tracking branch 'clockevents/clockevents/next'

Conflicts:
arch/arm/mach-rockchip/Kconfig
drivers/clocksource/Kconfig
drivers/clocksource/rockchip_timer.c

9 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Thu, 9 Apr 2015 05:13:12 +0000 (15:13 +1000)]
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
include/linux/bpf.h
include/uapi/linux/bpf.h
samples/bpf/Makefile

9 years agoMerge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 05:11:15 +0000 (15:11 +1000)]
Merge remote-tracking branch 'spi/for-next'

Conflicts:
drivers/dma/intel_mid_dma.c
drivers/dma/intel_mid_dma_regs.h

9 years agoMerge remote-tracking branch 'mailbox/mailbox-for-next'
Stephen Rothwell [Thu, 9 Apr 2015 05:06:09 +0000 (15:06 +1000)]
Merge remote-tracking branch 'mailbox/mailbox-for-next'

9 years agoMerge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:58:22 +0000 (14:58 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt
Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt

9 years agoMerge remote-tracking branch 'audit/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:55:32 +0000 (14:55 +1000)]
Merge remote-tracking branch 'audit/next'

9 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:43:10 +0000 (14:43 +1000)]
Merge remote-tracking branch 'trivial/for-next'

9 years agoMerge remote-tracking branch 'jc_docs/docs-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:41:52 +0000 (14:41 +1000)]
Merge remote-tracking branch 'jc_docs/docs-next'

9 years agoMerge remote-tracking branch 'vfio/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:40:14 +0000 (14:40 +1000)]
Merge remote-tracking branch 'vfio/next'

9 years agoMerge remote-tracking branch 'dwmw2-iommu/master'
Stephen Rothwell [Thu, 9 Apr 2015 04:38:48 +0000 (14:38 +1000)]
Merge remote-tracking branch 'dwmw2-iommu/master'

9 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:37:12 +0000 (14:37 +1000)]
Merge remote-tracking branch 'iommu/next'

9 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 9 Apr 2015 04:36:10 +0000 (14:36 +1000)]
Merge remote-tracking branch 'watchdog/master'

9 years agoMerge remote-tracking branch 'selinux/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:34:50 +0000 (14:34 +1000)]
Merge remote-tracking branch 'selinux/next'

9 years agoMerge remote-tracking branch 'integrity/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:34:47 +0000 (14:34 +1000)]
Merge remote-tracking branch 'integrity/next'

9 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:33:28 +0000 (14:33 +1000)]
Merge remote-tracking branch 'security/next'

Conflicts:
drivers/char/tpm/tpm-chip.c

9 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:16:13 +0000 (14:16 +1000)]
Merge remote-tracking branch 'regulator/for-next'

9 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:15:06 +0000 (14:15 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

9 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 9 Apr 2015 04:13:18 +0000 (14:13 +1000)]
Merge remote-tracking branch 'battery/master'

Conflicts:
drivers/hid/wacom.h
drivers/hid/wacom_sys.c

9 years agoMerge remote-tracking branch 'backlight/for-backlight-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:12:14 +0000 (14:12 +1000)]
Merge remote-tracking branch 'backlight/for-backlight-next'

9 years agoMerge remote-tracking branch 'mfd/for-mfd-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:10:43 +0000 (14:10 +1000)]
Merge remote-tracking branch 'mfd/for-mfd-next'

9 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:09:14 +0000 (14:09 +1000)]
Merge remote-tracking branch 'md/for-next'

9 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:07:57 +0000 (14:07 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

9 years agoMerge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:06:27 +0000 (14:06 +1000)]
Merge remote-tracking branch 'mmc-uh/next'

9 years agoMerge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:02:54 +0000 (14:02 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'

9 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:00:45 +0000 (14:00 +1000)]
Merge remote-tracking branch 'block/for-next'

9 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 9 Apr 2015 03:58:39 +0000 (13:58 +1000)]
Merge remote-tracking branch 'input/next'

9 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:57:38 +0000 (13:57 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'

9 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:56:05 +0000 (13:56 +1000)]
Merge remote-tracking branch 'modules/modules-next'

9 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:53:58 +0000 (13:53 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

9 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:52:18 +0000 (13:52 +1000)]
Merge remote-tracking branch 'sound/for-next'

9 years agoMerge remote-tracking branch 'drm-exynos/exynos-drm/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:51:16 +0000 (13:51 +1000)]
Merge remote-tracking branch 'drm-exynos/exynos-drm/for-next'

9 years agoMerge remote-tracking branch 'drm-misc/topic/drm-misc'
Stephen Rothwell [Thu, 9 Apr 2015 03:49:53 +0000 (13:49 +1000)]
Merge remote-tracking branch 'drm-misc/topic/drm-misc'

9 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:47:56 +0000 (13:47 +1000)]
Merge remote-tracking branch 'drm/drm-next'

9 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 9 Apr 2015 03:45:12 +0000 (13:45 +1000)]
Merge remote-tracking branch 'crypto/master'

Conflicts:
crypto/Kconfig

9 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 9 Apr 2015 03:44:02 +0000 (13:44 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

9 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 9 Apr 2015 03:42:52 +0000 (13:42 +1000)]
Merge remote-tracking branch 'bluetooth/master'

9 years agoMerge remote-tracking branch 'wireless-drivers-next/master'
Stephen Rothwell [Thu, 9 Apr 2015 03:41:39 +0000 (13:41 +1000)]
Merge remote-tracking branch 'wireless-drivers-next/master'

9 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Thu, 9 Apr 2015 03:40:35 +0000 (13:40 +1000)]
Merge remote-tracking branch 'ipsec-next/master'

9 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 9 Apr 2015 03:33:41 +0000 (13:33 +1000)]
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
arch/arm/mach-shmobile/board-ape6evm.c
arch/arm/mach-shmobile/board-mackerel.c

9 years agoMerge remote-tracking branch 'thermal-soc/next'
Stephen Rothwell [Thu, 9 Apr 2015 03:25:01 +0000 (13:25 +1000)]
Merge remote-tracking branch 'thermal-soc/next'

9 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 9 Apr 2015 03:23:49 +0000 (13:23 +1000)]
Merge remote-tracking branch 'thermal/next'

9 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Thu, 9 Apr 2015 03:13:06 +0000 (13:13 +1000)]
Merge remote-tracking branch 'idle/next'

9 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:00:33 +0000 (13:00 +1000)]
Merge remote-tracking branch 'pm/linux-next'

9 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:58:41 +0000 (12:58 +1000)]
Merge remote-tracking branch 'libata/for-next'

9 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:57:03 +0000 (12:57 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

9 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 9 Apr 2015 02:55:18 +0000 (12:55 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

9 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:54:11 +0000 (12:54 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

9 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:46:23 +0000 (12:46 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'

9 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:44:16 +0000 (12:44 +1000)]
Merge remote-tracking branch 'hid/for-next'

9 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Thu, 9 Apr 2015 02:39:33 +0000 (12:39 +1000)]
Merge remote-tracking branch 'pci/next'

9 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:27:55 +0000 (12:27 +1000)]
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/ext4/inode.c
fs/udf/file.c
net/9p/protocol.c

9 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Thu, 9 Apr 2015 02:19:48 +0000 (12:19 +1000)]
Merge remote-tracking branch 'net-next/master'

9 years agoMerge remote-tracking branch 'file-locks/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:08:28 +0000 (12:08 +1000)]
Merge remote-tracking branch 'file-locks/linux-next'

9 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:06:39 +0000 (12:06 +1000)]
Merge remote-tracking branch 'xfs/for-next'

9 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:05:30 +0000 (12:05 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'

9 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:04:29 +0000 (12:04 +1000)]
Merge remote-tracking branch 'v9fs/for-next'

9 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:03:24 +0000 (12:03 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'