]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Thu, 9 Apr 2015 04:34:50 +0000 (14:34 +1000)]
Merge remote-tracking branch 'selinux/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:34:47 +0000 (14:34 +1000)]
Merge remote-tracking branch 'integrity/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
Stephen Rothwell [Thu, 9 Apr 2015 04:16:13 +0000 (14:16 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:15:06 +0000 (14:15 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
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
Stephen Rothwell [Thu, 9 Apr 2015 04:12:14 +0000 (14:12 +1000)]
Merge remote-tracking branch 'backlight/for-backlight-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:10:43 +0000 (14:10 +1000)]
Merge remote-tracking branch 'mfd/for-mfd-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:09:14 +0000 (14:09 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:07:57 +0000 (14:07 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:06:27 +0000 (14:06 +1000)]
Merge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:02:54 +0000 (14:02 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:00:45 +0000 (14:00 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:58:39 +0000 (13:58 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 9 Apr 2015 03:57:38 +0000 (13:57 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:56:05 +0000 (13:56 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:53:58 +0000 (13:53 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:52:18 +0000 (13:52 +1000)]
Merge remote-tracking branch 'sound/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'
Stephen Rothwell [Thu, 9 Apr 2015 03:49:53 +0000 (13:49 +1000)]
Merge remote-tracking branch 'drm-misc/topic/drm-misc'
Stephen Rothwell [Thu, 9 Apr 2015 03:47:56 +0000 (13:47 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:45:12 +0000 (13:45 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
crypto/Kconfig
Stephen Rothwell [Thu, 9 Apr 2015 03:44:02 +0000 (13:44 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 9 Apr 2015 03:42:52 +0000 (13:42 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 9 Apr 2015 03:41:39 +0000 (13:41 +1000)]
Merge remote-tracking branch 'wireless-drivers-next/master'
Stephen Rothwell [Thu, 9 Apr 2015 03:40:35 +0000 (13:40 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
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
Stephen Rothwell [Thu, 9 Apr 2015 03:25:01 +0000 (13:25 +1000)]
Merge remote-tracking branch 'thermal-soc/next'
Stephen Rothwell [Thu, 9 Apr 2015 03:23:49 +0000 (13:23 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 9 Apr 2015 03:13:06 +0000 (13:13 +1000)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Thu, 9 Apr 2015 03:00:33 +0000 (13:00 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:58:41 +0000 (12:58 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:57:03 +0000 (12:57 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:55:18 +0000 (12:55 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 9 Apr 2015 02:54:11 +0000 (12:54 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:46:23 +0000 (12:46 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:44:16 +0000 (12:44 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:39:33 +0000 (12:39 +1000)]
Merge remote-tracking branch 'pci/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
Stephen Rothwell [Thu, 9 Apr 2015 02:19:48 +0000 (12:19 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Thu, 9 Apr 2015 02:08:28 +0000 (12:08 +1000)]
Merge remote-tracking branch 'file-locks/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:06:39 +0000 (12:06 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:05:30 +0000 (12:05 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:04:29 +0000 (12:04 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:03:24 +0000 (12:03 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:02:23 +0000 (12:02 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:01:20 +0000 (12:01 +1000)]
Merge remote-tracking branch 'gfs2/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:01:16 +0000 (12:01 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Conflicts:
fs/fscache/object.c
Stephen Rothwell [Thu, 9 Apr 2015 01:50:26 +0000 (11:50 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Thu, 9 Apr 2015 01:49:07 +0000 (11:49 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 9 Apr 2015 01:37:46 +0000 (11:37 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Thu, 9 Apr 2015 01:36:38 +0000 (11:36 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 01:36:36 +0000 (11:36 +1000)]
Merge remote-tracking branch 'ceph/master'
Conflicts:
fs/ceph/inode.c
fs/ceph/snap.c
fs/ceph/super.c
fs/ceph/super.h
include/linux/ceph/libceph.h
net/ceph/auth_x.c
net/ceph/ceph_common.c
Stephen Rothwell [Thu, 9 Apr 2015 01:35:24 +0000 (11:35 +1000)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Thu, 9 Apr 2015 01:34:22 +0000 (11:34 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Thu, 9 Apr 2015 01:33:15 +0000 (11:33 +1000)]
Merge remote-tracking branch 'uml/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 01:31:39 +0000 (11:31 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Thu, 9 Apr 2015 01:30:36 +0000 (11:30 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 9 Apr 2015 01:27:54 +0000 (11:27 +1000)]
Merge remote-tracking branch 'fsl/next'
Stephen Rothwell [Thu, 9 Apr 2015 01:24:36 +0000 (11:24 +1000)]
Merge remote-tracking branch 'powerpc-mpe/next'
Stephen Rothwell [Thu, 9 Apr 2015 01:18:51 +0000 (11:18 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 9 Apr 2015 01:17:50 +0000 (11:17 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 01:08:28 +0000 (11:08 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Conflicts:
drivers/bus/Makefile
drivers/irqchip/Makefile
Stephen Rothwell [Thu, 9 Apr 2015 01:07:25 +0000 (11:07 +1000)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 01:06:24 +0000 (11:06 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 01:05:18 +0000 (11:05 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 01:04:15 +0000 (11:04 +1000)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Thu, 9 Apr 2015 01:03:10 +0000 (11:03 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 01:02:07 +0000 (11:02 +1000)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 01:00:51 +0000 (11:00 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Thu, 9 Apr 2015 00:49:43 +0000 (10:49 +1000)]
Merge remote-tracking branch 'arm64-acpi/for-next/acpi'
Stephen Rothwell [Thu, 9 Apr 2015 00:48:37 +0000 (10:48 +1000)]
Merge remote-tracking branch 'arm64/for-next/core'
Conflicts:
arch/arm64/configs/defconfig
Stephen Rothwell [Thu, 9 Apr 2015 00:47:01 +0000 (10:47 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 00:45:54 +0000 (10:45 +1000)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 00:44:52 +0000 (10:44 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Conflicts:
arch/arm/mach-exynos/platsmp.c
Stephen Rothwell [Thu, 9 Apr 2015 00:44:30 +0000 (10:44 +1000)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Thu, 9 Apr 2015 00:44:29 +0000 (10:44 +1000)]
Merge remote-tracking branch 'omap-pending/for-next'
Conflicts:
arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Stephen Rothwell [Thu, 9 Apr 2015 00:43:09 +0000 (10:43 +1000)]
Merge remote-tracking branch 'omap/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 00:41:52 +0000 (10:41 +1000)]
Merge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 00:41:46 +0000 (10:41 +1000)]
Merge remote-tracking branch 'keystone/next'
Stephen Rothwell [Thu, 9 Apr 2015 00:40:30 +0000 (10:40 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 00:40:28 +0000 (10:40 +1000)]
Merge remote-tracking branch 'cortex-m/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 00:39:27 +0000 (10:39 +1000)]
Merge remote-tracking branch 'rpi/for-rpi-next'
Stephen Rothwell [Thu, 9 Apr 2015 00:38:17 +0000 (10:38 +1000)]
Merge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Thu, 9 Apr 2015 00:36:44 +0000 (10:36 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 00:35:38 +0000 (10:35 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Thu, 9 Apr 2015 00:33:02 +0000 (10:33 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 00:32:01 +0000 (10:32 +1000)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 00:29:40 +0000 (10:29 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Thu, 9 Apr 2015 00:29:38 +0000 (10:29 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Thu, 9 Apr 2015 00:29:37 +0000 (10:29 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Thu, 9 Apr 2015 00:29:36 +0000 (10:29 +1000)]
Merge remote-tracking branch 'ipsec/master'
Stephen Rothwell [Thu, 9 Apr 2015 00:29:35 +0000 (10:29 +1000)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 9 Apr 2015 00:29:32 +0000 (10:29 +1000)]
Merge remote-tracking branch 'arm-current/fixes'
Benjamin Herrenschmidt [Wed, 8 Apr 2015 23:14:38 +0000 (09:14 +1000)]
Merge branch 'next-sriov' into next
Merge Richard's work to support SR-IOV on PowerNV. All generic PCI
patches acked by Bjorn.
Linus Torvalds [Wed, 8 Apr 2015 22:12:25 +0000 (15:12 -0700)]
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Final drm fixes: one core locking imbalance regression, and a bunch of
i915 baytrail s/r fixes"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm: fix drm_mode_getconnector() locking imbalance regression
drm/i915/vlv: remove wait for previous GFX clk disable request
drm/i915/chv: Remove Wait for a previous gfx force-off
drm/i915/vlv: save/restore the power context base reg
Linus Torvalds [Wed, 8 Apr 2015 21:51:56 +0000 (14:51 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull ceph revert from Sage Weil:
"This corrects a recent misadventure with __GFP_MEMALLOC and
PF_MEMALLOC; it turns out it's not a good fit for RBD and we're better
off relying on dirty page throttling"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
Revert "libceph: use memalloc flags for net IO"
Dave Airlie [Wed, 8 Apr 2015 21:48:27 +0000 (07:48 +1000)]
Merge tag 'v4.0-rc7' into drm-next
Linux 4.0-rc7
Requested by Alex for fixes -next needs.
Conflicts:
drivers/gpu/drm/i915/intel_sprite.c
Linus Torvalds [Wed, 8 Apr 2015 21:42:49 +0000 (14:42 -0700)]
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"Three fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: numa: disable change protection for vma(VM_HUGETLB)
include/linux/dmapool.h: declare struct device
mm: move zone lock to a different cache line than order-0 free page lists
Linus Torvalds [Tue, 7 Apr 2015 17:33:49 +0000 (10:33 -0700)]
Copy the kernel module data from user space in chunks
Unlike most (all?) other copies from user space, kernel module loading
is almost unlimited in size. So we do a potentially huge
"copy_from_user()" when we copy the module data from user space to the
kernel buffer, which can be a latency concern when preemption is
disabled (or voluntary).
Also, because 'copy_from_user()' clears the tail of the kernel buffer on
failures, even a *failed* copy can end up wasting a lot of time.
Normally neither of these are concerns in real life, but they do trigger
when doing stress-testing with trinity. Running in a VM seems to add
its own overheadm causing trinity module load testing to even trigger
the watchdog.
The simple fix is to just chunk up the module loading, so that it never
tries to copy insanely big areas in one go. That bounds the latency,
and also the amount of (unnecessarily, in this case) cleared memory for
the failure case.
Reported-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>