summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-02-24Add linux-next specific files for 20140224next-20140224Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2014-02-24Merge branch 'akpm/master'Stephen Rothwell
2014-02-24mm: add strictlimit knobMaxim Patlasov
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>
2014-02-24arm: move arm_dma_limit to setup_dma_zoneVladimir Murzin
Since 4dcfa600 ("ARM: DMA-API: better handing of DMA masks for coherent allocations") arm_dma_limit_pfn has almost substituted the arm_dma_limit. The remaining user is dma_contiguous_reserve(). It is also referenced in setup_dma_zone() to calculate arm_dma_limit_pfn. Kill the global arm_dma_limit and equip setup_zone_dma with the local one. Signed-off-by: Vladimir Murzin <murzin.v@gmail.com> Reported-by: Vassili Karpov <av1474@comtv.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-02-24drivers/w1/w1_int.c: call put_device if device_register failsLevente Kurusa
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>
2014-02-24Merge branch 'akpm-current/current'Stephen Rothwell
Conflicts: drivers/sbus/char/jsflash.c mm/memcontrol.c
2014-02-24Merge remote-tracking branch 'llvmlinux/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'lzo-update/lzo-update'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'random/dev'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'clk/clk-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'pinctrl/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'target-updates/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'cgroup/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'char-misc/char-misc-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'staging/staging-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'usb-gadget/next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'usb/usb-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'tty/tty-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'driver-core/driver-core-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'leds/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'regmap/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'workqueues/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'percpu/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'xen-tip/linux-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'rcu/rcu/next'Stephen Rothwell
Conflicts: kernel/rcu/rcutorture.c
2014-02-24Merge remote-tracking branch 'ftrace/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'edac-amd/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'tip/auto-latest'Stephen Rothwell
2014-02-24next-20140221/spiStephen Rothwell
2014-02-24Merge remote-tracking branch 'devicetree/devicetree/next'Stephen Rothwell
Conflicts: drivers/of/of_net.c
2014-02-24Merge remote-tracking branch 'trivial/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'selinux/next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'security/next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'regulator/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'omap_dss2/for-next'Stephen Rothwell
2014-02-24next-20140210/mfd-ljStephen Rothwell
2014-02-24Merge remote-tracking branch 'kgdb/kgdb-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'mmc/mmc-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'device-mapper/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'block/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'input/next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'virtio/virtio-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'modules/modules-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'sound-asoc/for-next'Stephen Rothwell
Conflicts: sound/soc/kirkwood/Kconfig
2014-02-24Merge remote-tracking branch 'sound/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'drm-tegra/drm/for-next'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'drm-intel/for-linux-next'Stephen Rothwell
Conflicts: drivers/gpu/drm/i915/intel_dp.c
2014-02-24Merge remote-tracking branch 'crypto/master'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'l2-mtd/master'Stephen Rothwell
2014-02-24Merge remote-tracking branch 'mtd/master'Stephen Rothwell