]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 27 Jun 2014 04:08:28 +0000 (14:08 +1000)]
Merge branch 'akpm-current/current'
Stephen Rothwell [Fri, 27 Jun 2014 03:46:56 +0000 (13:46 +1000)]
Merge branch 'rd-docs/master'
Stephen Rothwell [Fri, 27 Jun 2014 03:45:31 +0000 (13:45 +1000)]
Merge remote-tracking branch 'aio/master'
Stephen Rothwell [Fri, 27 Jun 2014 03:43:54 +0000 (13:43 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Fri, 27 Jun 2014 03:42:30 +0000 (13:42 +1000)]
Merge remote-tracking branch 'random/dev'
Stephen Rothwell [Fri, 27 Jun 2014 03:41:17 +0000 (13:41 +1000)]
Merge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:40:20 +0000 (13:40 +1000)]
Merge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:30:22 +0000 (13:30 +1000)]
Merge remote-tracking branch 'userns/for-next'
Conflicts:
fs/btrfs/ioctl.c
fs/dcache.c
fs/namei.c
fs/namespace.c
Stephen Rothwell [Fri, 27 Jun 2014 03:29:02 +0000 (13:29 +1000)]
Merge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:28:53 +0000 (13:28 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/vhost/net.c
Stephen Rothwell [Fri, 27 Jun 2014 03:27:52 +0000 (13:27 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:18:46 +0000 (13:18 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:17:31 +0000 (13:17 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:13:19 +0000 (13:13 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Conflicts:
drivers/w1/masters/mxc_w1.c
Stephen Rothwell [Fri, 27 Jun 2014 03:11:36 +0000 (13:11 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:10:33 +0000 (13:10 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:00:12 +0000 (13:00 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:58:40 +0000 (12:58 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:47:01 +0000 (12:47 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:37:35 +0000 (12:37 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:25:53 +0000 (12:25 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Fri, 27 Jun 2014 02:24:54 +0000 (12:24 +1000)]
Merge remote-tracking branch 'irqchip/irqchip/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:23:51 +0000 (12:23 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:22:30 +0000 (12:22 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Fri, 27 Jun 2014 02:10:38 +0000 (12:10 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Fri, 27 Jun 2014 02:09:23 +0000 (12:09 +1000)]
Merge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:05:45 +0000 (12:05 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Fri, 27 Jun 2014 02:03:56 +0000 (12:03 +1000)]
Merge remote-tracking branch 'audit/master'
Conflicts:
arch/mips/include/asm/syscall.h
arch/mips/kernel/ptrace.c
arch/x86/Kconfig
kernel/audit.c
Stephen Rothwell [Fri, 27 Jun 2014 02:02:28 +0000 (12:02 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
arch/arm/mach-msm/Kconfig
Stephen Rothwell [Fri, 27 Jun 2014 02:01:07 +0000 (12:01 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 27 Jun 2014 01:59:49 +0000 (11:59 +1000)]
Merge remote-tracking branch 'selinux/next'
Stephen Rothwell [Fri, 27 Jun 2014 01:59:40 +0000 (11:59 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 27 Jun 2014 01:58:25 +0000 (11:58 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:57:15 +0000 (11:57 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:55:46 +0000 (11:55 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:54:14 +0000 (11:54 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:53:55 +0000 (11:53 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:52:41 +0000 (11:52 +1000)]
Merge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Fri, 27 Jun 2014 01:50:27 +0000 (11:50 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:50:24 +0000 (11:50 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:48:53 +0000 (11:48 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:47:58 +0000 (11:47 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:46:18 +0000 (11:46 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:45:23 +0000 (11:45 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:43:09 +0000 (11:43 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 27 Jun 2014 01:41:43 +0000 (11:41 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Conflicts:
net/bluetooth/hci_conn.c
net/bluetooth/smp.c
Stephen Rothwell [Fri, 27 Jun 2014 01:39:36 +0000 (11:39 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Fri, 27 Jun 2014 01:27:49 +0000 (11:27 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 27 Jun 2014 01:26:48 +0000 (11:26 +1000)]
Merge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Fri, 27 Jun 2014 01:25:34 +0000 (11:25 +1000)]
Merge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:25:29 +0000 (11:25 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:23:42 +0000 (11:23 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:22:44 +0000 (11:22 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:21:23 +0000 (11:21 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:20:06 +0000 (11:20 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 27 Jun 2014 01:19:06 +0000 (11:19 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:17:54 +0000 (11:17 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:11:25 +0000 (11:11 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:10:20 +0000 (11:10 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:08:40 +0000 (11:08 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:06:47 +0000 (11:06 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 27 Jun 2014 01:05:49 +0000 (11:05 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 27 Jun 2014 01:05:40 +0000 (11:05 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Fri, 27 Jun 2014 01:04:46 +0000 (11:04 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 27 Jun 2014 01:03:38 +0000 (11:03 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 27 Jun 2014 01:02:37 +0000 (11:02 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Fri, 27 Jun 2014 01:01:38 +0000 (11:01 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:00:17 +0000 (11:00 +1000)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Fri, 27 Jun 2014 00:59:14 +0000 (10:59 +1000)]
Merge remote-tracking branch 'uml/next'
Conflicts:
arch/um/include/asm/Kbuild
Stephen Rothwell [Fri, 27 Jun 2014 00:58:17 +0000 (10:58 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 27 Jun 2014 00:57:12 +0000 (10:57 +1000)]
Merge remote-tracking branch 'fsl/next'
Stephen Rothwell [Fri, 27 Jun 2014 00:48:18 +0000 (10:48 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 27 Jun 2014 00:47:23 +0000 (10:47 +1000)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 00:46:30 +0000 (10:46 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 00:44:56 +0000 (10:44 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 00:43:57 +0000 (10:43 +1000)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 00:43:04 +0000 (10:43 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 00:42:11 +0000 (10:42 +1000)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Fri, 27 Jun 2014 00:41:12 +0000 (10:41 +1000)]
Merge remote-tracking branch 'mvebu/for-next'
Conflicts:
arch/arm/mach-mvebu/Kconfig
Stephen Rothwell [Fri, 27 Jun 2014 00:40:02 +0000 (10:40 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'
Conflicts:
arch/arm/mach-imx/Kconfig
Stephen Rothwell [Fri, 27 Jun 2014 00:39:50 +0000 (10:39 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Fri, 27 Jun 2014 00:38:52 +0000 (10:38 +1000)]
Merge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 00:37:52 +0000 (10:37 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 00:37:00 +0000 (10:37 +1000)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 00:35:17 +0000 (10:35 +1000)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Stephen Rothwell [Fri, 27 Jun 2014 00:35:08 +0000 (10:35 +1000)]
Merge remote-tracking branch 'ide/master'
Stephen Rothwell [Fri, 27 Jun 2014 00:35:07 +0000 (10:35 +1000)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Fri, 27 Jun 2014 00:35:05 +0000 (10:35 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Fri, 27 Jun 2014 00:35:04 +0000 (10:35 +1000)]
Merge remote-tracking branch 'usb-serial-fixes/usb-linus'
Stephen Rothwell [Fri, 27 Jun 2014 00:35:03 +0000 (10:35 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Fri, 27 Jun 2014 00:35:02 +0000 (10:35 +1000)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Fri, 27 Jun 2014 00:35:01 +0000 (10:35 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Fri, 27 Jun 2014 00:35:00 +0000 (10:35 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'
Jiri Kosina [Thu, 26 Jun 2014 22:34:05 +0000 (00:34 +0200)]
Merge branch 'for-3.17/upstream' into for-next
Himangi Saraogi [Thu, 26 Jun 2014 17:28:52 +0000 (22:58 +0530)]
HID: roccat: Drop cast
This patch removes the cast on data of type void* as it is not needed.
The following Coccinelle semantic patch was used for making the change:
@r@
expression x;
void* e;
type T;
identifier f;
@@
(
*((T *)e)
|
((T *)x)[...]
|
((T *)x)->f
|
- (T *)
e
)
Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Linus Torvalds [Thu, 26 Jun 2014 20:06:13 +0000 (13:06 -0700)]
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A small collection of fixes/changes for the current series. This
contains:
- Removal of dead code from Gu Zheng.
- Revert of two bad fixes that went in earlier in this round, marking
things as __init that were not purely used from init.
- A fix for blk_mq_start_hw_queue() using the __blk_mq_run_hw_queue(),
which could place us wrongly. Make it use the non __ variant,
which handles cases where we are called from the wrong CPU set.
From me.
- A fix for drbd, which allocates discard requests without room for
the SCSI payload. From Lars Ellenberg.
- A fix for user-after-free in the blkcg code from Tejun.
- Addition of limiting gaps in SG lists, if the hardware needs it.
This is the last pre-req patch for blk-mq to enable the full NVMe
conversion. Could wait until 3.17, but it's simple enough so would
be nice to have everything we need for the NVMe port in the 3.17
release. From me"
* 'for-linus' of git://git.kernel.dk/linux-block:
drbd: fix NULL pointer deref in blk_add_request_payload
blk-mq: blk_mq_start_hw_queue() should use blk_mq_run_hw_queue()
block: add support for limiting gaps in SG lists
bio: remove unused macro bip_vec_idx()
Revert "block: add __init to elv_register"
Revert "block: add __init to blkcg_policy_register"
blkcg: fix use-after-free in __blkg_release_rcu() by making blkcg_gq refcnt an atomic_t
floppy: format block0 read error message properly
Al Viro [Mon, 23 Jun 2014 07:44:40 +0000 (08:44 +0100)]
Fix 32-bit regression in block device read(2)
blkdev_read_iter() wants to cap the iov_iter by the amount of data
remaining to the end of device. That's what iov_iter_truncate() is for
(trim iter->count if it's above the given limit). So far, so good, but
the argument of iov_iter_truncate() is size_t, so on 32bit boxen (in
case of a large device) we end up with that upper limit truncated down
to 32 bits *before* comparing it with iter->count.
Easily fixed by making iov_iter_truncate() take 64bit argument - it does
the right thing after such change (we only reach the assignment in there
when the current value of iter->count is greater than the limit, i.e.
for anything that would get truncated we don't reach the assignment at
all) and that argument is not the new value of iter->count - it's an
upper limit for such.
The overhead of passing u64 is not an issue - the thing is inlined, so
callers passing size_t won't pay any penalty.
Reported-and-tested-by: Theodore Tso <tytso@mit.edu>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Tested-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk>
Tested-by: Bruno Wolff III <bruno@wolff.to>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Peter De Schrijver [Fri, 30 May 2014 15:03:57 +0000 (18:03 +0300)]
clk: flatten clk tree in debugfs
This patch flattens the clk tree in CCF debugfs. Instead of representing the
clocks and their hierarchy as a directory structure under
/sys/kernel/debug/clk, each clock gets a single directory directly under
/sys/kernel/debug/clk. The orphans directory is replaced by a file called
clk_orphan_summary.
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Stephen Boyd [Fri, 13 Jun 2014 23:36:31 +0000 (16:36 -0700)]
clkdev: Don't print errors on probe defer
This error message can spam the logs if you have lots of probe
deferals due to missing clocks. Just silence the error in this
case because the driver should try again later.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Pranith Kumar [Wed, 11 Jun 2014 20:39:41 +0000 (16:39 -0400)]
rcu: Fix a sparse warning in rcu_report_unblock_qs_rnp()
This commit annotates rcu_report_unblock_qs_rnp() in order to fix the
following sparse warning:
kernel/rcu/tree_plugin.h:990:13: warning: context imbalance in 'rcu_report_unblock_qs_rnp' - unexpected unlock
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>