OSDN Git Service
Stephen Rothwell [Fri, 25 Sep 2015 05:02:22 +0000 (15:02 +1000)]
Add linux-next specific files for
20150925
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Stephen Rothwell [Fri, 25 Sep 2015 04:18:50 +0000 (14:18 +1000)]
Merge branch 'akpm/master'
Levente Kurusa [Tue, 22 Sep 2015 23:04:42 +0000 (09:04 +1000)]
drivers/w1/w1_int.c: call put_device if device_register fails
Currently, memsetting and kfreeing the device is bad behaviour. The
device will have a reference count of 1 and hence can cause trouble
because it has kfree'd. Proper way to handle a failed device_register is
to call put_device right after it fails.
Signed-off-by: Levente Kurusa <levex@linux.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Tue, 22 Sep 2015 23:04:42 +0000 (09:04 +1000)]
remove-abs64-fix
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Tue, 22 Sep 2015 23:04:42 +0000 (09:04 +1000)]
Remove abs64()
Switch everything to the new and more capable implementation of abs().
Mainly to give the new abs() a bit of a workout.
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Michal Nazarewicz [Tue, 22 Sep 2015 23:04:41 +0000 (09:04 +1000)]
kernel.h: make abs() work with 64-bit types
For 64-bit arguments, the abs macro casts it to an int which leads to lost
precision and may cause incorrect results. To deal with 64-bit types
abs64 macro has been introduced but still there are places where abs macro
is used incorrectly.
To deal with the problem, expand abs macro such that it operates on s64
type when dealing with 64-bit types while still returning long when
dealing with smaller types.
This fixes one known bug (per John):
The internal clocksteering done for fine-grained error correction uses a
: logarithmic approximation, so any time adjtimex() adjusts the clock
: steering, timekeeping_freqadjust() quickly approximates the correct clock
: frequency over a series of ticks.
:
: Unfortunately, the logic in timekeeping_freqadjust(), introduced in commit
:
dc491596f639438 (Rework frequency adjustments to work better w/ nohz),
: used the abs() function with a s64 error value to calculate the size of
: the approximated adjustment to be made.
:
: Per include/linux/kernel.h: "abs() should not be used for 64-bit types
: (s64, u64, long long) - use abs64()".
:
: Thus on 32-bit platforms, this resulted in the clocksteering to take a
: quite dampended random walk trying to converge on the proper frequency,
: which caused the adjustments to be made much slower then intended (most
: easily observed when large adjustments are made).
Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Reported-by: John Stultz <john.stultz@linaro.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Tue, 22 Sep 2015 23:04:41 +0000 (09:04 +1000)]
net/ipv4/route.c: prevent oops
Fix oops in ip_route_input_slow()
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Fri, 25 Sep 2015 04:00:36 +0000 (14:00 +1000)]
Merge branch 'akpm-current/current'
Stephen Rothwell [Fri, 25 Sep 2015 03:38:57 +0000 (13:38 +1000)]
Merge remote-tracking branch 'rtc/rtc-next'
Stephen Rothwell [Fri, 25 Sep 2015 03:38:10 +0000 (13:38 +1000)]
Merge remote-tracking branch 'coresight/next'
Stephen Rothwell [Fri, 25 Sep 2015 03:38:09 +0000 (13:38 +1000)]
Merge remote-tracking branch 'livepatching/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 03:38:06 +0000 (13:38 +1000)]
Merge remote-tracking branch 'access_once/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 03:36:58 +0000 (13:36 +1000)]
Merge remote-tracking branch 'y2038/y2038'
Stephen Rothwell [Fri, 25 Sep 2015 03:36:43 +0000 (13:36 +1000)]
Merge remote-tracking branch 'llvmlinux/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 03:35:36 +0000 (13:35 +1000)]
Merge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Fri, 25 Sep 2015 03:34:46 +0000 (13:34 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 03:33:55 +0000 (13:33 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 03:25:59 +0000 (13:25 +1000)]
Merge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Fri, 25 Sep 2015 02:59:22 +0000 (12:59 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 02:45:01 +0000 (12:45 +1000)]
Merge remote-tracking branch 'kdbus/kdbus'
Stephen Rothwell [Fri, 25 Sep 2015 02:44:14 +0000 (12:44 +1000)]
Merge remote-tracking branch 'extcon/extcon-next'
Stephen Rothwell [Fri, 25 Sep 2015 02:42:41 +0000 (12:42 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Fri, 25 Sep 2015 02:41:50 +0000 (12:41 +1000)]
Merge remote-tracking branch 'ipmi/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 02:41:05 +0000 (12:41 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 02:40:20 +0000 (12:40 +1000)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 02:38:39 +0000 (12:38 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 02:37:53 +0000 (12:37 +1000)]
Merge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 02:23:44 +0000 (12:23 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 02:23:41 +0000 (12:23 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 02:10:17 +0000 (12:10 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:53:56 +0000 (11:53 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Fri, 25 Sep 2015 01:53:51 +0000 (11:53 +1000)]
Merge remote-tracking branch 'irqchip/irqchip/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:52:46 +0000 (11:52 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:51:42 +0000 (11:51 +1000)]
Merge remote-tracking branch 'clockevents/clockevents/next'
Stephen Rothwell [Fri, 25 Sep 2015 01:35:09 +0000 (11:35 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Fri, 25 Sep 2015 01:33:18 +0000 (11:33 +1000)]
Merge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:32:13 +0000 (11:32 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:31:07 +0000 (11:31 +1000)]
Merge remote-tracking branch 'audit/next'
Stephen Rothwell [Fri, 25 Sep 2015 01:30:21 +0000 (11:30 +1000)]
Merge remote-tracking branch 'jc_docs/docs-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:29:10 +0000 (11:29 +1000)]
Merge remote-tracking branch 'dwmw2-iommu/master'
Stephen Rothwell [Fri, 25 Sep 2015 01:28:24 +0000 (11:28 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 25 Sep 2015 01:27:19 +0000 (11:27 +1000)]
Merge remote-tracking branch 'selinux/next'
Stephen Rothwell [Fri, 25 Sep 2015 01:26:13 +0000 (11:26 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:25:09 +0000 (11:25 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 25 Sep 2015 01:23:31 +0000 (11:23 +1000)]
Merge remote-tracking branch 'mfd/for-mfd-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:22:24 +0000 (11:22 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:21:13 +0000 (11:21 +1000)]
Merge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Fri, 25 Sep 2015 01:20:21 +0000 (11:20 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 25 Sep 2015 01:19:35 +0000 (11:19 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:18:30 +0000 (11:18 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:17:04 +0000 (11:17 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:15:08 +0000 (11:15 +1000)]
Merge remote-tracking branch 'drm-misc/topic/drm-misc'
Stephen Rothwell [Fri, 25 Sep 2015 01:13:44 +0000 (11:13 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:00:29 +0000 (11:00 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:59:25 +0000 (10:59 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:58:40 +0000 (10:58 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:57:28 +0000 (10:57 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:56:42 +0000 (10:56 +1000)]
Merge remote-tracking branch 'wireless-drivers-next/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:50:16 +0000 (10:50 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:40:23 +0000 (10:40 +1000)]
Merge remote-tracking branch 'thermal-soc/next'
Stephen Rothwell [Fri, 25 Sep 2015 00:39:17 +0000 (10:39 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 25 Sep 2015 00:39:08 +0000 (10:39 +1000)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Fri, 25 Sep 2015 00:27:46 +0000 (10:27 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:26:59 +0000 (10:26 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:25:45 +0000 (10:25 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:25:43 +0000 (10:25 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:24:57 +0000 (10:24 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:24:12 +0000 (10:24 +1000)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:23:26 +0000 (10:23 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:22:33 +0000 (10:22 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:21:30 +0000 (10:21 +1000)]
Merge remote-tracking branch 'file-locks/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:20:41 +0000 (10:20 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:19:56 +0000 (10:19 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:19:09 +0000 (10:19 +1000)]
Merge remote-tracking branch 'overlayfs/overlayfs-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:18:22 +0000 (10:18 +1000)]
Merge remote-tracking branch 'orangefs/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:16:51 +0000 (10:16 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:15:59 +0000 (10:15 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:15:14 +0000 (10:15 +1000)]
Merge remote-tracking branch 'gfs2/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:14:26 +0000 (10:14 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Fri, 25 Sep 2015 00:13:40 +0000 (10:13 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 25 Sep 2015 00:12:55 +0000 (10:12 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Fri, 25 Sep 2015 00:12:10 +0000 (10:12 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:12:09 +0000 (10:12 +1000)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:11:21 +0000 (10:11 +1000)]
Merge remote-tracking branch 'uml/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:10:37 +0000 (10:10 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Thu, 24 Sep 2015 23:56:53 +0000 (09:56 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 24 Sep 2015 23:56:04 +0000 (09:56 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:56:01 +0000 (09:56 +1000)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:55:17 +0000 (09:55 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:54:32 +0000 (09:54 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:54:26 +0000 (09:54 +1000)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Thu, 24 Sep 2015 23:53:36 +0000 (09:53 +1000)]
Merge remote-tracking branch 'h8300/h8300-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:52:52 +0000 (09:52 +1000)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:52:06 +0000 (09:52 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:51:21 +0000 (09:51 +1000)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:50:37 +0000 (09:50 +1000)]
Merge remote-tracking branch 'samsung-krzk/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:49:54 +0000 (09:49 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:49:09 +0000 (09:49 +1000)]
Merge remote-tracking branch 'rockchip/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:48:25 +0000 (09:48 +1000)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Thu, 24 Sep 2015 23:47:40 +0000 (09:47 +1000)]
Merge remote-tracking branch 'qcom/qcom/for-next'