]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agothinkpad-acpi: kill hotkey_thread_mutex
Oleg Nesterov [Sun, 10 Mar 2013 10:54:33 +0000 (21:54 +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>
Cc: Henrique de Moraes Holschuh <ibm-acpi@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 agokmsg: honor dmesg_restrict sysctl on /dev/kmsg
Josh Boyer [Sun, 10 Mar 2013 10:54:33 +0000 (21:54 +1100)]
kmsg: honor dmesg_restrict sysctl on /dev/kmsg

Originally, the addition of dmesg_restrict covered both the syslog
method of accessing dmesg, as well as /dev/kmsg itself.  This was done
indirectly by security_syslog calling cap_syslog before doing any LSM
checks.

However, commit 12b3052c3ee ("capabilities/syslog: open code cap_syslog
logic to fix build failure") moved the code around and pushed the checks
into the caller itself.  That seems to have inadvertently dropped the
checks for dmesg_restrict on /dev/kmsg.  Most people haven't noticed
because util-linux dmesg(1) defaults to using the syslog method for access
in older versions.  With util-linux 2.22 and a kernel newer than 3.5,
dmesg(1) defaults to reading directly from /dev/kmsg.

Fix this by making an explicit check in the devkmsg_open function.

This fixes https://bugzilla.redhat.com/show_bug.cgi?id=903192

Signed-off-by: Josh Boyer <jwboyer@redhat.com>
Reported-by: Christian Kujau <lists@nerdbynature.de>
Cc: Eric Paris <eparis@redhat.com>
Cc: James Morris <jmorris@namei.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agoinclude/linux/res_counter.h needs errno.h
Andrew Morton [Sun, 10 Mar 2013 10:54:33 +0000 (21:54 +1100)]
include/linux/res_counter.h needs errno.h

alpha allmodconfig:

In file included from mm/memcontrol.c:28:
include/linux/res_counter.h: In function 'res_counter_set_limit':
include/linux/res_counter.h:203: error: 'EBUSY' undeclared (first use in this function)
include/linux/res_counter.h:203: error: (Each undeclared identifier is reported only once
include/linux/res_counter.h:203: error: for each function it appears in.)

Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Glauber Costa <glommer@parallels.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Frederic Weisbecker <fweisbec@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agoMerge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Tue, 12 Mar 2013 03:33:33 +0000 (14:33 +1100)]
Merge remote-tracking branch 'lzo-update/lzo-update'

11 years agoMerge remote-tracking branch 'signal/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 03:25:55 +0000 (14:25 +1100)]
Merge remote-tracking branch 'signal/for-next'

Conflicts:
arch/mips/kernel/linux32.c
arch/tile/kernel/compat.c

11 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 03:13:48 +0000 (14:13 +1100)]
Merge remote-tracking branch 'userns/for-next'

11 years agoMerge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 03:12:16 +0000 (14:12 +1100)]
Merge remote-tracking branch 'pwm/for-next'

11 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 03:10:44 +0000 (14:10 +1100)]
Merge remote-tracking branch 'tegra/for-next'

11 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 03:09:16 +0000 (14:09 +1100)]
Merge remote-tracking branch 'samsung/for-next'

11 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Tue, 12 Mar 2013 03:07:44 +0000 (14:07 +1100)]
Merge remote-tracking branch 'renesas/next'

Conflicts:
arch/arm/mach-shmobile/setup-sh73a0.c

11 years agoMerge remote-tracking branch 'msm/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 02:47:53 +0000 (13:47 +1100)]
Merge remote-tracking branch 'msm/for-next'

11 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Tue, 12 Mar 2013 02:47:47 +0000 (13:47 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

11 years agoMerge remote-tracking branch 'cortex/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 02:46:16 +0000 (13:46 +1100)]
Merge remote-tracking branch 'cortex/for-next'

Conflicts:
arch/arm/include/asm/cputype.h

11 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 02:44:43 +0000 (13:44 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

11 years agoRevert "gpio/palmas: add in GPIO support for palmas charger"
Stephen Rothwell [Tue, 12 Mar 2013 02:43:10 +0000 (13:43 +1100)]
Revert "gpio/palmas: add in GPIO support for palmas charger"

This reverts commit 82d4d6637fdf3dd413d2d2f2fa371ea41fb8fa00.

11 years agoMerge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Tue, 12 Mar 2013 02:41:32 +0000 (13:41 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'

11 years agoMerge remote-tracking branch 'irqdomain/irqdomain/next'
Stephen Rothwell [Tue, 12 Mar 2013 02:40:03 +0000 (13:40 +1100)]
Merge remote-tracking branch 'irqdomain/irqdomain/next'

11 years agoMerge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Tue, 12 Mar 2013 02:38:26 +0000 (13:38 +1100)]
Merge remote-tracking branch 'vhost/linux-next'

11 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 02:36:47 +0000 (13:36 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'

11 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Tue, 12 Mar 2013 02:34:59 +0000 (13:34 +1100)]
Merge remote-tracking branch 'staging/staging-next'

11 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 02:33:10 +0000 (13:33 +1100)]
Merge remote-tracking branch 'regmap/for-next'

11 years agoMerge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Tue, 12 Mar 2013 02:32:58 +0000 (13:32 +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 [Tue, 12 Mar 2013 02:17:42 +0000 (13:17 +1100)]
Merge remote-tracking branch 'workqueues/for-next'

11 years agoMerge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Tue, 12 Mar 2013 02:11:18 +0000 (13:11 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'

11 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Tue, 12 Mar 2013 02:09:34 +0000 (13:09 +1100)]
Merge remote-tracking branch 'kvm/linux-next'

11 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 02:01:59 +0000 (13:01 +1100)]
Merge remote-tracking branch 'ftrace/for-next'

11 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Tue, 12 Mar 2013 01:55:06 +0000 (12:55 +1100)]
Merge remote-tracking branch 'tip/auto-latest'

11 years agoMerge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Tue, 12 Mar 2013 01:53:36 +0000 (12:53 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'

11 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 01:51:59 +0000 (12:51 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'

11 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 01:50:22 +0000 (12:50 +1100)]
Merge remote-tracking branch 'trivial/for-next'

11 years agoMerge remote-tracking branch 'vfio/next'
Stephen Rothwell [Tue, 12 Mar 2013 01:48:46 +0000 (12:48 +1100)]
Merge remote-tracking branch 'vfio/next'

11 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 12 Mar 2013 01:47:15 +0000 (12:47 +1100)]
Merge remote-tracking branch 'iommu/next'

11 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Tue, 12 Mar 2013 01:47:09 +0000 (12:47 +1100)]
Merge remote-tracking branch 'watchdog/master'

11 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Tue, 12 Mar 2013 01:47:02 +0000 (12:47 +1100)]
Merge remote-tracking branch 'selinux/master'

11 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Tue, 12 Mar 2013 01:46:59 +0000 (12:46 +1100)]
Merge remote-tracking branch 'security/next'

11 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 01:45:24 +0000 (12:45 +1100)]
Merge remote-tracking branch 'regulator/for-next'

11 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Tue, 12 Mar 2013 01:45:09 +0000 (12:45 +1100)]
Merge remote-tracking branch 'battery/master'

Conflicts:
include/linux/mfd/abx500/ab8500-bm.h

11 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 01:43:32 +0000 (12:43 +1100)]
Merge remote-tracking branch 'md/for-next'

11 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 01:36:20 +0000 (12:36 +1100)]
Merge remote-tracking branch 'slab/for-next'

11 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 12 Mar 2013 01:36:17 +0000 (12:36 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

11 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 12 Mar 2013 01:34:48 +0000 (12:34 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

11 years agoMerge branch 'device-mapper/master'
Stephen Rothwell [Tue, 12 Mar 2013 01:33:07 +0000 (12:33 +1100)]
Merge branch 'device-mapper/master'

11 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 01:33:04 +0000 (12:33 +1100)]
Merge remote-tracking branch 'block/for-next'

11 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 01:28:47 +0000 (12:28 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

11 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 12 Mar 2013 01:21:51 +0000 (12:21 +1100)]
Merge remote-tracking branch 'input/next'

11 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Tue, 12 Mar 2013 01:20:22 +0000 (12:20 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

11 years agoMerge remote-tracking branch 'pekey/devel-pekey'
Stephen Rothwell [Tue, 12 Mar 2013 01:13:27 +0000 (12:13 +1100)]
Merge remote-tracking branch 'pekey/devel-pekey'

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

11 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 01:10:04 +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 [Tue, 12 Mar 2013 01:02:43 +0000 (12:02 +1100)]
Merge remote-tracking branch 'drm-intel/drm-intel-next-queued'

Conflicts:
drivers/gpu/drm/i915/intel_hdmi.c
drivers/gpu/drm/i915/intel_sdvo.c

11 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 12 Mar 2013 01:01:10 +0000 (12:01 +1100)]
Merge remote-tracking branch 'crypto/master'

11 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 12 Mar 2013 00:59:40 +0000 (11:59 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

11 years agoMerge remote-tracking branch 'mtd/master'
Stephen Rothwell [Tue, 12 Mar 2013 00:58:12 +0000 (11:58 +1100)]
Merge remote-tracking branch 'mtd/master'

11 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 12 Mar 2013 00:56:42 +0000 (11:56 +1100)]
Merge remote-tracking branch 'bluetooth/master'

11 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Tue, 12 Mar 2013 00:52:12 +0000 (11:52 +1100)]
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
net/nfc/llcp/llcp.c

11 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Tue, 12 Mar 2013 00:36:46 +0000 (11:36 +1100)]
Merge remote-tracking branch 'ipsec-next/master'

11 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Tue, 12 Mar 2013 00:32:41 +0000 (11:32 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c

11 years agoMerge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Tue, 12 Mar 2013 00:12:14 +0000 (11:12 +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 [Tue, 12 Mar 2013 00:10:43 +0000 (11:10 +1100)]
Merge remote-tracking branch 'slave-dma/next'

11 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Tue, 12 Mar 2013 00:08:46 +0000 (11:08 +1100)]
Merge remote-tracking branch 'thermal/next'

11 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Tue, 12 Mar 2013 00:06:58 +0000 (11:06 +1100)]
Merge remote-tracking branch 'libata/NEXT'

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 00:05:14 +0000 (11:05 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 12 Mar 2013 00:05:11 +0000 (11:05 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 12 Mar 2013 00:03:47 +0000 (11:03 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 00:02:23 +0000 (11:02 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'

11 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 12 Mar 2013 00:00:55 +0000 (11:00 +1100)]
Merge remote-tracking branch 'hid/for-next'

11 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Mon, 11 Mar 2013 23:59:28 +0000 (10:59 +1100)]
Merge remote-tracking branch 'xfs/for-next'

11 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Mon, 11 Mar 2013 23:57:34 +0000 (10:57 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 11 Mar 2013 23:56:09 +0000 (10:56 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 11 Mar 2013 23:54:30 +0000 (10:54 +1100)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Mon, 11 Mar 2013 23:53:04 +0000 (10:53 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'

11 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 11 Mar 2013 23:51:41 +0000 (10:51 +1100)]
Merge remote-tracking branch 'gfs2/master'

11 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Mon, 11 Mar 2013 23:50:18 +0000 (10:50 +1100)]
Merge remote-tracking branch 'f2fs/dev'

11 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 11 Mar 2013 23:48:50 +0000 (10:48 +1100)]
Merge remote-tracking branch 'ext4/dev'

11 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Mon, 11 Mar 2013 23:47:27 +0000 (10:47 +1100)]
Merge remote-tracking branch 'ext3/for_next'

11 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Mon, 11 Mar 2013 23:46:01 +0000 (10:46 +1100)]
Merge remote-tracking branch 'ceph/master'

11 years agoMerge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Mon, 11 Mar 2013 23:46:00 +0000 (10:46 +1100)]
Merge remote-tracking branch 'btrfs/next'

11 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Mon, 11 Mar 2013 23:44:34 +0000 (10:44 +1100)]
Merge remote-tracking branch 'tile/master'

11 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Mon, 11 Mar 2013 23:43:12 +0000 (10:43 +1100)]
Merge remote-tracking branch 'sh/sh-latest'

11 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 11 Mar 2013 23:41:49 +0000 (10:41 +1100)]
Merge remote-tracking branch 's390/features'

11 years agoMerge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Mon, 11 Mar 2013 23:40:22 +0000 (10:40 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'

11 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 11 Mar 2013 23:39:00 +0000 (10:39 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

11 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 11 Mar 2013 23:37:35 +0000 (10:37 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

11 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Mon, 11 Mar 2013 23:37:33 +0000 (10:37 +1100)]
Merge remote-tracking branch 'ia64/next'

11 years agoMerge remote-tracking branch 'xilinx/arm-next'
Stephen Rothwell [Mon, 11 Mar 2013 23:37:27 +0000 (10:37 +1100)]
Merge remote-tracking branch 'xilinx/arm-next'

Conflicts:
arch/arm/mach-zynq/common.c

11 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Mon, 11 Mar 2013 23:37:22 +0000 (10:37 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

11 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Mon, 11 Mar 2013 23:37:22 +0000 (10:37 +1100)]
Merge remote-tracking branch 'arm/for-next'

11 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Mon, 11 Mar 2013 23:35:58 +0000 (10:35 +1100)]
Merge remote-tracking branch 'arc/for-next'

11 years agoMerge remote-tracking branch 'dwmw2/master'
Stephen Rothwell [Mon, 11 Mar 2013 23:34:22 +0000 (10:34 +1100)]
Merge remote-tracking branch 'dwmw2/master'

Conflicts:
arch/powerpc/Kconfig
arch/x86/Kconfig

11 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Mon, 11 Mar 2013 23:34:20 +0000 (10:34 +1100)]
Merge remote-tracking branch 'ide/master'

11 years agoMerge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Mon, 11 Mar 2013 23:34:14 +0000 (10:34 +1100)]
Merge remote-tracking branch 'staging.current/staging-linus'

11 years agoMerge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Mon, 11 Mar 2013 23:34:14 +0000 (10:34 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'

11 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Mon, 11 Mar 2013 23:34:13 +0000 (10:34 +1100)]
Merge remote-tracking branch 'tty.current/tty-linus'

11 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Mon, 11 Mar 2013 23:34:12 +0000 (10:34 +1100)]
Merge remote-tracking branch 'wireless/master'

11 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Mon, 11 Mar 2013 23:34:11 +0000 (10:34 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

11 years agoMerge remote-tracking branch 'ipsec/master'
Stephen Rothwell [Mon, 11 Mar 2013 23:34:09 +0000 (10:34 +1100)]
Merge remote-tracking branch 'ipsec/master'

11 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Mon, 11 Mar 2013 23:34:08 +0000 (10:34 +1100)]
Merge remote-tracking branch 'sparc/master'

11 years agoMerge remote-tracking branch 'arc-current/for-curr'
Stephen Rothwell [Mon, 11 Mar 2013 23:34:06 +0000 (10:34 +1100)]
Merge remote-tracking branch 'arc-current/for-curr'

11 years agodrm/i915: clarify reasoning for the access_ok call
Kees Cook [Mon, 11 Mar 2013 21:37:35 +0000 (14:37 -0700)]
drm/i915: clarify reasoning for the access_ok call

This clarifies the comment above the access_ok check so a missing
VERIFY_READ doesn't alarm anyone.

v2:
 - rewrote comment, thanks to Chris Wilson

Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
[danvet: add patch history log to commit message.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
11 years agodrm/i915: use simple attribute in debugfs routines
Kees Cook [Sun, 10 Mar 2013 21:10:06 +0000 (14:10 -0700)]
drm/i915: use simple attribute in debugfs routines

This replaces the manual read/write routines in debugfs with the common
simple attribute helpers. Doing this gets rid of repeated copy/pasting
of copy_from_user and value formatting code.

Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>