summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-17Add linux-next specific files for 20140417next-20140417Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2014-04-17Merge branch 'akpm/master'Stephen Rothwell
2014-04-17mm: 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-04-17ufs: sb mutex merge + mutex_destroyFabian Frederick
788257d6101d9 ("ufs: remove the BKL") replaced BKL with mutex protection using functions lock_ufs, unlock_ufs and struct mutex 'mutex' in sb_info. b6963327e052 ("ufs: drop lock/unlock super") removed lock/unlock super and added struct mutex 's_lock' in sb_info. Those 2 mutexes are generally locked/unlocked at the same time except in allocation (balloc, ialloc). This patch merges the 2 mutexes and propagates first commit solution. It also adds mutex destruction before kfree during ufs_fill_super failure and ufs_put_super. [akpm@linux-foundation.org: avoid ifdefs, return -EROFS not -EINVAL] Signed-off-by: Fabian Frederick <fabf@skynet.be> Cc: Evgeniy Dushistov <dushistov@mail.ru> Cc: "Chen, Jet" <jet.chen@intel.com> Cc: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-04-17arm: 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-04-17drivers/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-04-17drivers/gpio/gpio-zevio.c: fix buildAndrew Morton
Unbreak i386 allmodconfig. This is a hack - please fix properly ;) Cc: Fabian Vogt <fabian@ritter-vogt.de> Cc: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-04-17Merge branch 'akpm-current/current'Stephen Rothwell
2014-04-17Merge branch 'rd-docs/master'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'aio/master'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'lzo-update/lzo-update'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'clk/clk-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'gpio/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'pinctrl/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'scsi/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'staging/staging-next'Stephen Rothwell
Conflicts: drivers/staging/rtl8723au/core/rtw_ieee80211.c drivers/staging/rtl8723au/core/rtw_mlme_ext.c drivers/staging/rtl8723au/core/rtw_p2p.c drivers/staging/rtl8723au/core/rtw_wlan_util.c
2014-04-17Merge remote-tracking branch 'leds/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'regmap/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'drivers-x86/linux-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'workqueues/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'percpu/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'xen-tip/linux-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'edac-amd/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'tip/auto-latest'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'spi/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'dt-rh/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'audit/master'Stephen Rothwell
Conflicts: arch/mips/include/asm/syscall.h arch/x86/Kconfig kernel/audit.c
2014-04-17Merge remote-tracking branch 'dwmw2-iommu/master'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'selinux/next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'security/next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'regulator/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'omap_dss2/for-next'Stephen Rothwell
Conflicts: drivers/gpu/drm/exynos/exynos_dp_core.c drivers/gpu/drm/exynos/exynos_dp_core.h drivers/gpu/drm/exynos/exynos_dp_reg.c drivers/gpu/drm/exynos/exynos_dp_reg.h drivers/video/Kconfig drivers/video/Makefile drivers/video/exynos/exynos_dp_core.c drivers/video/exynos/exynos_dp_core.h drivers/video/exynos/exynos_dp_reg.c drivers/video/exynos/exynos_dp_reg.h drivers/video/fbdev/exynos/exynos_dp_core.c drivers/video/fbdev/exynos/exynos_dp_core.h drivers/video/fbdev/exynos/exynos_dp_reg.c drivers/video/fbdev/exynos/exynos_dp_reg.h drivers/video/fbdev/sgivwfb.c
2014-04-17Merge remote-tracking branch 'kgdb/kgdb-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'device-mapper/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'block/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'sound-asoc/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'sound/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'drm-tegra/drm/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'drm-intel/for-linux-next'Stephen Rothwell
Conflicts: drivers/gpu/drm/i915/i915_gem_context.c
2014-04-17Merge remote-tracking branch 'crypto/master'Stephen Rothwell
Conflicts: drivers/char/hw_random/Kconfig drivers/crypto/bfin_crc.h
2014-04-17Merge remote-tracking branch 'l2-mtd/master'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'infiniband/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'bluetooth/master'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'dmaengine/next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'slave-dma/next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'libata/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'kbuild/for-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'v4l-dvb/master'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'hwmon-staging/hwmon-next'Stephen Rothwell
2014-04-17Merge remote-tracking branch 'hid/for-next'Stephen Rothwell