The patch below does not apply to the 3.18-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 0722069a5374b904ec1a67f91249f90e1cfae259 Mon Sep 17 00:00:00 2001
From: Andreas Ziegler <andreas.ziegler(a)fau.de>
Date: Wed, 16 Jan 2019 15:16:29 +0100
Subject: [PATCH] tracing/uprobes: Fix output for multiple string arguments
When printing multiple uprobe arguments as strings the output for the
earlier arguments would also include all later string arguments.
This is best explained in an example:
Consider adding a uprobe to a function receiving two strings as
parameters which is at offset 0xa0 in strlib.so and we want to print
both parameters when the uprobe is hit (on x86_64):
$ echo 'p:func /lib/strlib.so:0xa0 +0(%di):string +0(%si):string' > \
/sys/kernel/debug/tracing/uprobe_events
When the function is called as func("foo", "bar") and we hit the probe,
the trace file shows a line like the following:
[...] func: (0x7f7e683706a0) arg1="foobar" arg2="bar"
Note the extra "bar" printed as part of arg1. This behaviour stacks up
for additional string arguments.
The strings are stored in a dynamically growing part of the uprobe
buffer by fetch_store_string() after copying them from userspace via
strncpy_from_user(). The return value of strncpy_from_user() is then
directly used as the required size for the string. However, this does
not take the terminating null byte into account as the documentation
for strncpy_from_user() cleary states that it "[...] returns the
length of the string (not including the trailing NUL)" even though the
null byte will be copied to the destination.
Therefore, subsequent calls to fetch_store_string() will overwrite
the terminating null byte of the most recently fetched string with
the first character of the current string, leading to the
"accumulation" of strings in earlier arguments in the output.
Fix this by incrementing the return value of strncpy_from_user() by
one if we did not hit the maximum buffer size.
Link: http://lkml.kernel.org/r/20190116141629.5752-1-andreas.ziegler@fau.de
Cc: Ingo Molnar <mingo(a)redhat.com>
Cc: stable(a)vger.kernel.org
Fixes: 5baaa59ef09e ("tracing/probes: Implement 'memory' fetch method for uprobes")
Acked-by: Masami Hiramatsu <mhiramat(a)kernel.org>
Signed-off-by: Andreas Ziegler <andreas.ziegler(a)fau.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org>
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 19a1a8e19062..9bde07c06362 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -160,6 +160,13 @@ fetch_store_string(unsigned long addr, void *dest, void *base)
if (ret >= 0) {
if (ret == maxlen)
dst[ret - 1] = '\0';
+ else
+ /*
+ * Include the terminating null byte. In this case it
+ * was copied by strncpy_from_user but not accounted
+ * for in ret.
+ */
+ ret++;
*(u32 *)dest = make_data_loc(ret, (void *)dst - base);
}
The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 0722069a5374b904ec1a67f91249f90e1cfae259 Mon Sep 17 00:00:00 2001
From: Andreas Ziegler <andreas.ziegler(a)fau.de>
Date: Wed, 16 Jan 2019 15:16:29 +0100
Subject: [PATCH] tracing/uprobes: Fix output for multiple string arguments
When printing multiple uprobe arguments as strings the output for the
earlier arguments would also include all later string arguments.
This is best explained in an example:
Consider adding a uprobe to a function receiving two strings as
parameters which is at offset 0xa0 in strlib.so and we want to print
both parameters when the uprobe is hit (on x86_64):
$ echo 'p:func /lib/strlib.so:0xa0 +0(%di):string +0(%si):string' > \
/sys/kernel/debug/tracing/uprobe_events
When the function is called as func("foo", "bar") and we hit the probe,
the trace file shows a line like the following:
[...] func: (0x7f7e683706a0) arg1="foobar" arg2="bar"
Note the extra "bar" printed as part of arg1. This behaviour stacks up
for additional string arguments.
The strings are stored in a dynamically growing part of the uprobe
buffer by fetch_store_string() after copying them from userspace via
strncpy_from_user(). The return value of strncpy_from_user() is then
directly used as the required size for the string. However, this does
not take the terminating null byte into account as the documentation
for strncpy_from_user() cleary states that it "[...] returns the
length of the string (not including the trailing NUL)" even though the
null byte will be copied to the destination.
Therefore, subsequent calls to fetch_store_string() will overwrite
the terminating null byte of the most recently fetched string with
the first character of the current string, leading to the
"accumulation" of strings in earlier arguments in the output.
Fix this by incrementing the return value of strncpy_from_user() by
one if we did not hit the maximum buffer size.
Link: http://lkml.kernel.org/r/20190116141629.5752-1-andreas.ziegler@fau.de
Cc: Ingo Molnar <mingo(a)redhat.com>
Cc: stable(a)vger.kernel.org
Fixes: 5baaa59ef09e ("tracing/probes: Implement 'memory' fetch method for uprobes")
Acked-by: Masami Hiramatsu <mhiramat(a)kernel.org>
Signed-off-by: Andreas Ziegler <andreas.ziegler(a)fau.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org>
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 19a1a8e19062..9bde07c06362 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -160,6 +160,13 @@ fetch_store_string(unsigned long addr, void *dest, void *base)
if (ret >= 0) {
if (ret == maxlen)
dst[ret - 1] = '\0';
+ else
+ /*
+ * Include the terminating null byte. In this case it
+ * was copied by strncpy_from_user but not accounted
+ * for in ret.
+ */
+ ret++;
*(u32 *)dest = make_data_loc(ret, (void *)dst - base);
}
The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 0722069a5374b904ec1a67f91249f90e1cfae259 Mon Sep 17 00:00:00 2001
From: Andreas Ziegler <andreas.ziegler(a)fau.de>
Date: Wed, 16 Jan 2019 15:16:29 +0100
Subject: [PATCH] tracing/uprobes: Fix output for multiple string arguments
When printing multiple uprobe arguments as strings the output for the
earlier arguments would also include all later string arguments.
This is best explained in an example:
Consider adding a uprobe to a function receiving two strings as
parameters which is at offset 0xa0 in strlib.so and we want to print
both parameters when the uprobe is hit (on x86_64):
$ echo 'p:func /lib/strlib.so:0xa0 +0(%di):string +0(%si):string' > \
/sys/kernel/debug/tracing/uprobe_events
When the function is called as func("foo", "bar") and we hit the probe,
the trace file shows a line like the following:
[...] func: (0x7f7e683706a0) arg1="foobar" arg2="bar"
Note the extra "bar" printed as part of arg1. This behaviour stacks up
for additional string arguments.
The strings are stored in a dynamically growing part of the uprobe
buffer by fetch_store_string() after copying them from userspace via
strncpy_from_user(). The return value of strncpy_from_user() is then
directly used as the required size for the string. However, this does
not take the terminating null byte into account as the documentation
for strncpy_from_user() cleary states that it "[...] returns the
length of the string (not including the trailing NUL)" even though the
null byte will be copied to the destination.
Therefore, subsequent calls to fetch_store_string() will overwrite
the terminating null byte of the most recently fetched string with
the first character of the current string, leading to the
"accumulation" of strings in earlier arguments in the output.
Fix this by incrementing the return value of strncpy_from_user() by
one if we did not hit the maximum buffer size.
Link: http://lkml.kernel.org/r/20190116141629.5752-1-andreas.ziegler@fau.de
Cc: Ingo Molnar <mingo(a)redhat.com>
Cc: stable(a)vger.kernel.org
Fixes: 5baaa59ef09e ("tracing/probes: Implement 'memory' fetch method for uprobes")
Acked-by: Masami Hiramatsu <mhiramat(a)kernel.org>
Signed-off-by: Andreas Ziegler <andreas.ziegler(a)fau.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org>
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 19a1a8e19062..9bde07c06362 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -160,6 +160,13 @@ fetch_store_string(unsigned long addr, void *dest, void *base)
if (ret >= 0) {
if (ret == maxlen)
dst[ret - 1] = '\0';
+ else
+ /*
+ * Include the terminating null byte. In this case it
+ * was copied by strncpy_from_user but not accounted
+ * for in ret.
+ */
+ ret++;
*(u32 *)dest = make_data_loc(ret, (void *)dst - base);
}
The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 0722069a5374b904ec1a67f91249f90e1cfae259 Mon Sep 17 00:00:00 2001
From: Andreas Ziegler <andreas.ziegler(a)fau.de>
Date: Wed, 16 Jan 2019 15:16:29 +0100
Subject: [PATCH] tracing/uprobes: Fix output for multiple string arguments
When printing multiple uprobe arguments as strings the output for the
earlier arguments would also include all later string arguments.
This is best explained in an example:
Consider adding a uprobe to a function receiving two strings as
parameters which is at offset 0xa0 in strlib.so and we want to print
both parameters when the uprobe is hit (on x86_64):
$ echo 'p:func /lib/strlib.so:0xa0 +0(%di):string +0(%si):string' > \
/sys/kernel/debug/tracing/uprobe_events
When the function is called as func("foo", "bar") and we hit the probe,
the trace file shows a line like the following:
[...] func: (0x7f7e683706a0) arg1="foobar" arg2="bar"
Note the extra "bar" printed as part of arg1. This behaviour stacks up
for additional string arguments.
The strings are stored in a dynamically growing part of the uprobe
buffer by fetch_store_string() after copying them from userspace via
strncpy_from_user(). The return value of strncpy_from_user() is then
directly used as the required size for the string. However, this does
not take the terminating null byte into account as the documentation
for strncpy_from_user() cleary states that it "[...] returns the
length of the string (not including the trailing NUL)" even though the
null byte will be copied to the destination.
Therefore, subsequent calls to fetch_store_string() will overwrite
the terminating null byte of the most recently fetched string with
the first character of the current string, leading to the
"accumulation" of strings in earlier arguments in the output.
Fix this by incrementing the return value of strncpy_from_user() by
one if we did not hit the maximum buffer size.
Link: http://lkml.kernel.org/r/20190116141629.5752-1-andreas.ziegler@fau.de
Cc: Ingo Molnar <mingo(a)redhat.com>
Cc: stable(a)vger.kernel.org
Fixes: 5baaa59ef09e ("tracing/probes: Implement 'memory' fetch method for uprobes")
Acked-by: Masami Hiramatsu <mhiramat(a)kernel.org>
Signed-off-by: Andreas Ziegler <andreas.ziegler(a)fau.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org>
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 19a1a8e19062..9bde07c06362 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -160,6 +160,13 @@ fetch_store_string(unsigned long addr, void *dest, void *base)
if (ret >= 0) {
if (ret == maxlen)
dst[ret - 1] = '\0';
+ else
+ /*
+ * Include the terminating null byte. In this case it
+ * was copied by strncpy_from_user but not accounted
+ * for in ret.
+ */
+ ret++;
*(u32 *)dest = make_data_loc(ret, (void *)dst - base);
}
This is the start of the stable review cycle for the 4.19.22 release.
There are 44 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Fri Feb 15 18:36:28 UTC 2019.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.22-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.19.22-rc1
Chuck Lever <chuck.lever(a)oracle.com>
svcrdma: Remove max_sge check at connect time
Chuck Lever <chuck.lever(a)oracle.com>
svcrdma: Reduce max_send_sges
Sven Eckelmann <sven(a)narfation.org>
batman-adv: Force mac header to start of data on xmit
Sven Eckelmann <sven(a)narfation.org>
batman-adv: Avoid WARN on net_device without parent in netns
Florian Westphal <fw(a)strlen.de>
xfrm: refine validation of template and selector families
Ilya Dryomov <idryomov(a)gmail.com>
libceph: avoid KEEPALIVE_PENDING races in ceph_con_keepalive()
Theodore Ts'o <tytso(a)mit.edu>
Revert "ext4: use ext4_write_inode() when fsyncing w/o a journal"
Benedict Wong <benedictwong(a)google.com>
xfrm: Make set-mark default behavior backward compatible
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Always drop the XPRT_LOCK on XPRT_CLOSE_WAIT
Thomas Hellstrom <thellstrom(a)vmware.com>
drm/vmwgfx: Return error code from vmw_execbuf_copy_fence_user
Thomas Hellstrom <thellstrom(a)vmware.com>
drm/vmwgfx: Fix setting of dma masks
Lucas De Marchi <lucas.demarchi(a)intel.com>
drm/i915: always return something on DDI clock selection
Gustavo A. R. Silva <gustavo(a)embeddedor.com>
drm/amd/powerplay: Fix missing break in switch
Tina Zhang <tina.zhang(a)intel.com>
drm/modes: Prevent division by zero htotal
Felix Fietkau <nbd(a)nbd.name>
mac80211: ensure that mgmt tx skbs have tailroom for encryption
Vincent Whitchurch <vincent.whitchurch(a)axis.com>
mic: vop: Fix use-after-free on remove
Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com>
powerpc/radix: Fix kernel crash with mremap()
Sudeep Holla <sudeep.holla(a)arm.com>
firmware: arm_scmi: provide the mandatory device release callback
Bartosz Golaszewski <bgolaszewski(a)baylibre.com>
ARM: dts: da850: fix interrupt numbers for clocksource
Marc Gonzalez <marc.w.gonzalez(a)free.fr>
ARM: tango: Improve ARCH_MULTIPLATFORM compatibility
Russell King <rmk+kernel(a)armlinux.org.uk>
ARM: iop32x/n2100: fix PCI IRQ mapping
Paul Burton <paul.burton(a)mips.com>
MIPS: VDSO: Include $(ccflags-vdso) in o32,n32 .lds builds
Yifeng Li <tomli(a)tomli.me>
mips: loongson64: remove unreachable(), fix loongson_poweroff().
Paul Burton <paul.burton(a)mips.com>
MIPS: VDSO: Use same -m%-float cflag as the kernel proper
Aaro Koskinen <aaro.koskinen(a)iki.fi>
MIPS: OCTEON: don't set octeon_dma_bar_type if PCI is disabled
Vladimir Kondratiev <vladimir.kondratiev(a)linux.intel.com>
mips: cm: reprime error cause
Andreas Ziegler <andreas.ziegler(a)fau.de>
tracing: uprobes: Fix typo in pr_fmt string
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
pinctrl: cherryview: fix Strago DMI workaround
Chen-Yu Tsai <wens(a)csie.org>
pinctrl: sunxi: Correct number of IRQ banks on H6 main pin controller
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
debugfs: fix debugfs_rename parameter checking
Tomas Winkler <tomas.winkler(a)intel.com>
samples: mei: use /dev/mei0 instead of /dev/mei
Tomas Winkler <tomas.winkler(a)intel.com>
mei: me: add ice lake point device id.
Dan Carpenter <dan.carpenter(a)oracle.com>
misc: vexpress: Off by one in vexpress_syscfg_exec()
Eric W. Biederman <ebiederm(a)xmission.com>
signal: Better detection of synchronous signals
Eric W. Biederman <ebiederm(a)xmission.com>
signal: Always notice exiting tasks
Dan Murphy <dmurphy(a)ti.com>
iio: ti-ads8688: Update buffer allocation for timestamps
Matt Ranostay <matt.ranostay(a)konsulko.com>
iio: chemical: atlas-ph-sensor: correct IIO_TEMP values to millicelsius
Hans de Goede <hdegoede(a)redhat.com>
iio: adc: axp288: Fix TS-pin handling
Martin Kelly <mkelly(a)xevo.com>
tools: iio: iio_generic_buffer: make num_loops signed
Hans de Goede <hdegoede(a)redhat.com>
libata: Add NOLPM quirk for SAMSUNG MZ7TE512HMHP-000L1 SSD
Martin Kepplinger <martink(a)posteo.de>
mtd: rawnand: gpmi: fix MX28 bus master lockup problem
Boris Brezillon <bbrezillon(a)kernel.org>
mtd: spinand: Fix the error/cleanup path in spinand_init()
Boris Brezillon <bbrezillon(a)kernel.org>
mtd: spinand: Handle the case where PROGRAM LOAD does not reset the cache
Boris Brezillon <bbrezillon(a)kernel.org>
mtd: Make sure mtd->erasesize is valid even if the partition is of size 0
-------------
Diffstat:
Makefile | 4 +-
arch/arm/boot/dts/da850.dtsi | 2 +-
arch/arm/mach-iop32x/n2100.c | 3 +-
arch/arm/mach-tango/pm.c | 6 +-
arch/arm/mach-tango/pm.h | 7 ++
arch/arm/mach-tango/setup.c | 2 +
arch/mips/kernel/mips-cm.c | 2 +-
arch/mips/loongson64/common/reset.c | 7 +-
arch/mips/pci/pci-octeon.c | 10 +--
arch/mips/vdso/Makefile | 5 +-
arch/powerpc/include/asm/book3s/64/pgtable.h | 22 ++---
arch/powerpc/mm/pgtable-book3s64.c | 22 +++++
drivers/ata/libata-core.c | 1 +
drivers/firmware/arm_scmi/bus.c | 9 +-
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 1 +
drivers/gpu/drm/drm_modes.c | 2 +-
drivers/gpu/drm/i915/intel_ddi.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 9 +-
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +-
drivers/iio/adc/axp288_adc.c | 76 ++++++++++++----
drivers/iio/adc/ti-ads8688.c | 3 +-
drivers/iio/chemical/atlas-ph-sensor.c | 7 +-
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/misc/mic/vop/vop_main.c | 4 +-
drivers/misc/vexpress-syscfg.c | 2 +-
drivers/mtd/mtdpart.c | 4 +
drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c | 13 ++-
drivers/mtd/nand/spi/core.c | 46 +++++-----
drivers/pinctrl/intel/pinctrl-cherryview.c | 8 +-
drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c | 2 +-
fs/debugfs/inode.c | 7 ++
fs/ext4/fsync.c | 13 +--
include/linux/sunrpc/xprt.h | 5 ++
kernel/signal.c | 58 +++++++++++-
kernel/trace/trace_uprobe.c | 2 +-
net/batman-adv/hard-interface.c | 5 +-
net/batman-adv/soft-interface.c | 2 +
net/ceph/messenger.c | 5 +-
net/mac80211/tx.c | 12 ++-
net/sunrpc/clnt.c | 6 +-
net/sunrpc/xprtrdma/svc_rdma_sendto.c | 105 ++++++++++++++++++++--
net/sunrpc/xprtrdma/svc_rdma_transport.c | 13 ++-
net/xfrm/xfrm_policy.c | 5 +-
net/xfrm/xfrm_user.c | 13 ++-
samples/mei/mei-amt-version.c | 2 +-
tools/iio/iio_generic_buffer.c | 2 +-
47 files changed, 402 insertions(+), 140 deletions(-)
This is the start of the stable review cycle for the 4.9.157 release.
There are 24 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Fri Feb 15 18:36:26 UTC 2019.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.157-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.9.157-rc1
Sven Eckelmann <sven(a)narfation.org>
batman-adv: Force mac header to start of data on xmit
Sven Eckelmann <sven(a)narfation.org>
batman-adv: Avoid WARN on net_device without parent in netns
Florian Westphal <fw(a)strlen.de>
xfrm: refine validation of template and selector families
Ilya Dryomov <idryomov(a)gmail.com>
libceph: avoid KEEPALIVE_PENDING races in ceph_con_keepalive()
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Revert "cifs: In Kconfig CONFIG_CIFS_POSIX needs depends on legacy (insecure cifs)"
Vladis Dronov <vdronov(a)redhat.com>
HID: debug: fix the ring buffer implementation
J. Bruce Fields <bfields(a)redhat.com>
nfsd4: catch some false session retries
J. Bruce Fields <bfields(a)redhat.com>
nfsd4: fix cached replies to solo SEQUENCE compounds
Thomas Hellstrom <thellstrom(a)vmware.com>
drm/vmwgfx: Return error code from vmw_execbuf_copy_fence_user
Thomas Hellstrom <thellstrom(a)vmware.com>
drm/vmwgfx: Fix setting of dma masks
Tina Zhang <tina.zhang(a)intel.com>
drm/modes: Prevent division by zero htotal
Felix Fietkau <nbd(a)nbd.name>
mac80211: ensure that mgmt tx skbs have tailroom for encryption
Marc Gonzalez <marc.w.gonzalez(a)free.fr>
ARM: tango: Improve ARCH_MULTIPLATFORM compatibility
Russell King <rmk+kernel(a)armlinux.org.uk>
ARM: iop32x/n2100: fix PCI IRQ mapping
Paul Burton <paul.burton(a)mips.com>
MIPS: VDSO: Include $(ccflags-vdso) in o32,n32 .lds builds
Aaro Koskinen <aaro.koskinen(a)iki.fi>
MIPS: OCTEON: don't set octeon_dma_bar_type if PCI is disabled
Vladimir Kondratiev <vladimir.kondratiev(a)linux.intel.com>
mips: cm: reprime error cause
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
debugfs: fix debugfs_rename parameter checking
Tomas Winkler <tomas.winkler(a)intel.com>
samples: mei: use /dev/mei0 instead of /dev/mei
Dan Carpenter <dan.carpenter(a)oracle.com>
misc: vexpress: Off by one in vexpress_syscfg_exec()
Eric W. Biederman <ebiederm(a)xmission.com>
signal: Better detection of synchronous signals
Eric W. Biederman <ebiederm(a)xmission.com>
signal: Always notice exiting tasks
Matt Ranostay <matt.ranostay(a)konsulko.com>
iio: chemical: atlas-ph-sensor: correct IIO_TEMP values to millicelsius
Martin Kepplinger <martin.kepplinger(a)ginzinger.com>
mtd: rawnand: gpmi: fix MX28 bus master lockup problem
-------------
Diffstat:
Makefile | 4 +-
arch/arm/mach-iop32x/n2100.c | 3 +-
arch/arm/mach-tango/pm.c | 6 +-
arch/arm/mach-tango/pm.h | 7 ++
arch/arm/mach-tango/setup.c | 2 +
arch/mips/kernel/mips-cm.c | 2 +-
arch/mips/pci/pci-octeon.c | 10 +--
arch/mips/vdso/Makefile | 4 +-
drivers/gpu/drm/drm_modes.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 9 ++-
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +-
drivers/hid/hid-debug.c | 122 +++++++++++++-------------------
drivers/iio/chemical/atlas-ph-sensor.c | 7 +-
drivers/misc/vexpress-syscfg.c | 2 +-
drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 15 ++--
fs/cifs/Kconfig | 2 +-
fs/debugfs/inode.c | 7 ++
fs/nfsd/nfs4state.c | 57 +++++++++++++--
fs/nfsd/state.h | 2 +
fs/nfsd/xdr4.h | 13 +++-
include/linux/hid-debug.h | 9 ++-
kernel/signal.c | 58 ++++++++++++++-
net/batman-adv/hard-interface.c | 5 +-
net/batman-adv/soft-interface.c | 2 +
net/ceph/messenger.c | 5 +-
net/mac80211/tx.c | 12 +++-
net/xfrm/xfrm_user.c | 13 ++--
samples/mei/mei-amt-version.c | 2 +-
28 files changed, 249 insertions(+), 135 deletions(-)