]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Mon, 2 Dec 2013 05:18:44 +0000 (16:18 +1100)]
Add linux-next specific files for
20131202
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Stephen Rothwell [Mon, 2 Dec 2013 05:04:32 +0000 (16:04 +1100)]
Merge branch 'akpm/master'
Maxim Patlasov [Sat, 23 Nov 2013 05:05:43 +0000 (16:05 +1100)]
mm: add strictlimit knob
The "strictlimit" feature was introduced to enforce per-bdi dirty limits
for FUSE which sets bdi max_ratio to 1% by default:
http://article.gmane.org/gmane.linux.kernel.mm/105809
However the feature can be useful for other relatively slow or untrusted
BDIs like USB flash drives and DVD+RW. The patch adds a knob to enable
the feature:
echo 1 > /sys/class/bdi/X:Y/strictlimit
Being enabled, the feature enforces bdi max_ratio limit even if global
(10%) dirty limit is not reached. Of course, the effect is not visible
until /sys/class/bdi/X:Y/max_ratio is decreased to some reasonable value.
Signed-off-by: Maxim Patlasov <MPatlasov@parallels.com>
Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: "Artem S. Tashkinov" <t.artem@lycos.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Jan Kara <jack@suse.cz>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Mon, 2 Dec 2013 04:52:49 +0000 (15:52 +1100)]
Merge branch 'akpm-current/current'
Stephen Rothwell [Mon, 2 Dec 2013 04:45:58 +0000 (15:45 +1100)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Mon, 2 Dec 2013 04:44:42 +0000 (15:44 +1100)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:43:07 +0000 (15:43 +1100)]
Merge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:42:13 +0000 (15:42 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:40:35 +0000 (15:40 +1100)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:39:47 +0000 (15:39 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:38:13 +0000 (15:38 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:37:25 +0000 (15:37 +1100)]
Merge remote-tracking branch 'usb-gadget/next'
Stephen Rothwell [Mon, 2 Dec 2013 04:27:18 +0000 (15:27 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:26:30 +0000 (15:26 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:25:23 +0000 (15:25 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:24:33 +0000 (15:24 +1100)]
Merge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:23:26 +0000 (15:23 +1100)]
Merge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:22:29 +0000 (15:22 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:21:40 +0000 (15:21 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:20:48 +0000 (15:20 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:10:36 +0000 (15:10 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Mon, 2 Dec 2013 04:09:32 +0000 (15:09 +1100)]
Merge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:09:24 +0000 (15:09 +1100)]
Merge remote-tracking branch 'audit/master'
Stephen Rothwell [Mon, 2 Dec 2013 04:09:10 +0000 (15:09 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Mon, 2 Dec 2013 04:08:19 +0000 (15:08 +1100)]
Merge remote-tracking branch 'watchdog/master'
Conflicts:
drivers/watchdog/rt2880_wdt.c
Stephen Rothwell [Mon, 2 Dec 2013 04:08:14 +0000 (15:08 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Mon, 2 Dec 2013 04:07:02 +0000 (15:07 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:05:43 +0000 (15:05 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Mon, 2 Dec 2013 04:04:30 +0000 (15:04 +1100)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:04:24 +0000 (15:04 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:04:21 +0000 (15:04 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Conflicts:
kernel/debug/debug_core.h
Stephen Rothwell [Mon, 2 Dec 2013 04:03:17 +0000 (15:03 +1100)]
Merge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 04:01:03 +0000 (15:01 +1100)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
fs/f2fs/data.c
fs/f2fs/segment.c
include/trace/events/f2fs.h
Stephen Rothwell [Mon, 2 Dec 2013 01:16:07 +0000 (12:16 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 01:15:17 +0000 (12:15 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 2 Dec 2013 01:14:07 +0000 (12:14 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 01:13:18 +0000 (12:13 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 01:12:04 +0000 (12:12 +1100)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Conflicts:
drivers/gpu/drm/i915/intel_display.c
Stephen Rothwell [Mon, 2 Dec 2013 00:44:36 +0000 (11:44 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 2 Dec 2013 00:43:45 +0000 (11:43 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 2 Dec 2013 00:42:47 +0000 (11:42 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi
Stephen Rothwell [Mon, 2 Dec 2013 00:42:32 +0000 (11:42 +1100)]
Merge remote-tracking branch 'idle/next'
Conflicts:
drivers/idle/intel_idle.c
Stephen Rothwell [Mon, 2 Dec 2013 00:40:31 +0000 (11:40 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:39:32 +0000 (11:39 +1100)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:38:36 +0000 (11:38 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:37:41 +0000 (11:37 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Mon, 2 Dec 2013 00:36:52 +0000 (11:36 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Mon, 2 Dec 2013 00:36:01 +0000 (11:36 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:35:07 +0000 (11:35 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:34:19 +0000 (11:34 +1100)]
Merge remote-tracking branch 'squashfs/master'
Stephen Rothwell [Mon, 2 Dec 2013 00:32:54 +0000 (11:32 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:31:33 +0000 (11:31 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 2 Dec 2013 00:30:42 +0000 (11:30 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 2 Dec 2013 00:29:53 +0000 (11:29 +1100)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Mon, 2 Dec 2013 00:29:04 +0000 (11:29 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Mon, 2 Dec 2013 00:28:10 +0000 (11:28 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:27:20 +0000 (11:27 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Mon, 2 Dec 2013 00:26:31 +0000 (11:26 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Mon, 2 Dec 2013 00:25:41 +0000 (11:25 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Mon, 2 Dec 2013 00:24:49 +0000 (11:24 +1100)]
Merge remote-tracking branch 'sh/sh-latest'
Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
drivers/tty/serial/sh-sci.c
include/linux/serial_sci.h
Stephen Rothwell [Mon, 2 Dec 2013 00:23:56 +0000 (11:23 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 2 Dec 2013 00:23:04 +0000 (11:23 +1100)]
Merge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:22:15 +0000 (11:22 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Mon, 2 Dec 2013 00:21:26 +0000 (11:21 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:20:39 +0000 (11:20 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Mon, 2 Dec 2013 00:19:51 +0000 (11:19 +1100)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:19:03 +0000 (11:19 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:18:13 +0000 (11:18 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:17:20 +0000 (11:17 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:16:29 +0000 (11:16 +1100)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:15:41 +0000 (11:15 +1100)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Mon, 2 Dec 2013 00:14:50 +0000 (11:14 +1100)]
Merge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:13:54 +0000 (11:13 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:13:51 +0000 (11:13 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:13:48 +0000 (11:13 +1100)]
Merge remote-tracking branch 'cortex-m/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:12:59 +0000 (11:12 +1100)]
Merge remote-tracking branch 'arm-v7-cache-opt/v7-cache-opt'
Stephen Rothwell [Mon, 2 Dec 2013 00:12:10 +0000 (11:12 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:10:58 +0000 (11:10 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:10:11 +0000 (11:10 +1100)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Mon, 2 Dec 2013 00:05:01 +0000 (11:05 +1100)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Stephen Rothwell [Mon, 2 Dec 2013 00:05:00 +0000 (11:05 +1100)]
Merge remote-tracking branch 'mfd-fixes/master'
Stephen Rothwell [Mon, 2 Dec 2013 00:04:55 +0000 (11:04 +1100)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Mon, 2 Dec 2013 00:04:54 +0000 (11:04 +1100)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Mon, 2 Dec 2013 00:04:53 +0000 (11:04 +1100)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus'
Stephen Rothwell [Mon, 2 Dec 2013 00:04:52 +0000 (11:04 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Mon, 2 Dec 2013 00:04:52 +0000 (11:04 +1100)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Mon, 2 Dec 2013 00:04:51 +0000 (11:04 +1100)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Mon, 2 Dec 2013 00:04:50 +0000 (11:04 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Mon, 2 Dec 2013 00:04:49 +0000 (11:04 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Mon, 2 Dec 2013 00:04:48 +0000 (11:04 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Mon, 2 Dec 2013 00:04:46 +0000 (11:04 +1100)]
Merge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Mon, 2 Dec 2013 00:04:45 +0000 (11:04 +1100)]
Merge remote-tracking branch 'arc-current/for-curr'
Jean Delvare [Sun, 1 Dec 2013 23:53:23 +0000 (10:53 +1100)]
hwmon: (it87) Print proper names for the IT8771E and IT8772E
The driver prints IT8771F and IT8772F instead of IT8771E and IT8772E
respectively when the driver is loaded. This is a cosmetic only bug
but let's fix it.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Rudolf Marek [Sun, 1 Dec 2013 23:53:22 +0000 (10:53 +1100)]
hwmon: (it87) Add support for the ITE IT8603E
Add support for IT8603E.
This closes bug #57861:
https://bugzilla.kernel.org/show_bug.cgi?id=57861
[JD: Fixes and clean-ups.]
Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Guenter Roeck [Sun, 1 Dec 2013 23:53:22 +0000 (10:53 +1100)]
hwmon: (lm90) Unregister hwmon device if interrupt setup fails
Commit
109b1283fb (hwmon: (lm90) Add support to handle IRQ) introduced
interrupt support. Its error handling code fails to unregister the already
registered hwmon device.
Fixes: 109b1283fb532ac773a076748ffccf76a7067cab
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Pali Rohár [Tue, 19 Nov 2013 10:18:03 +0000 (11:18 +0100)]
power_supply: Add power_supply notifier
This patch adds a notifier chain to the power_supply, this helps drivers
in other subsystem to listen to changes in power supply subsystem.
This would help to take some actions in those drivers on changing the
power supply properties. One such scenario is to increase/decrease system
performance based on the battery capacity/voltage. Another scenario is to
adjust the h/w peak current detection voltage/current thresholds based on
battery voltage/capacity. The notifier helps drivers to listen to changes
in power_suppy susbystem without polling the power_supply properties
Signed-off-by: Jenny TC <jenny.tc@intel.com>
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Acked-by: Jenny TC <jenny.tc@intel.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Austin Boyle [Sun, 24 Nov 2013 10:41:49 +0000 (21:41 +1100)]
max17042_battery: Fix build errors caused by missing REGMAP_I2C config
max17042 now uses regmap interface but does not enable config option. This
patch fixes the following build errors:
drivers/power/max17042_battery.c:661:15: error: variable ‘max17042_regmap_config’ has initializer but incomplete type
drivers/power/max17042_battery.c:662:2: error: unknown field ‘reg_bits’ specified in initializer
drivers/power/max17042_battery.c:662:2: warning: excess elements in struct initializer
drivers/power/max17042_battery.c:662:2: warning: (near initialization for ‘max17042_regmap_config’)
drivers/power/max17042_battery.c:663:2: error: unknown field ‘val_bits’ specified in initializer
drivers/power/max17042_battery.c:663:2: warning: excess elements in struct initializer
drivers/power/max17042_battery.c:663:2: warning: (near initialization for ‘max17042_regmap_config’)
drivers/power/max17042_battery.c:664:2: error: unknown field ‘val_format_endian’ specified in initializer
drivers/power/max17042_battery.c:664:23: error: ‘REGMAP_ENDIAN_NATIVE’ undeclared here (not in a function)
drivers/power/max17042_battery.c:664:2: warning: excess elements in struct initializer
drivers/power/max17042_battery.c:664:2: warning: (near initialization for ‘max17042_regmap_config’)
drivers/power/max17042_battery.c: In function ‘max17042_probe’:
drivers/power/max17042_battery.c:684:2: error: implicit declaration of function ‘devm_regmap_init_i2c’
Signed-off-by: Austin Boyle <boyle.austin@gmail.com>
Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Jason Cooper [Sun, 1 Dec 2013 22:23:04 +0000 (22:23 +0000)]
Merge branch 'mvebu/dt' into for-next
Jason Cooper [Sun, 1 Dec 2013 22:23:01 +0000 (22:23 +0000)]
Merge branch 'mvebu/defconfig' into for-next
Jason Cooper [Sun, 1 Dec 2013 22:22:59 +0000 (22:22 +0000)]
Merge branch 'mvebu/soc' into for-next