Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
  1. Jan 16, 2015
    • Stephen Rothwell's avatar
    • Stephen Rothwell's avatar
      Merge branch 'akpm/master' · aa8ce4f2
      Stephen Rothwell authored
      aa8ce4f2
    • Maxim Patlasov's avatar
      mm: add strictlimit knob · 979f4ac2
      Maxim Patlasov authored
      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: default avatarMaxim 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: default avatarAndrew Morton <akpm@linux-foundation.org>
      979f4ac2
    • Levente Kurusa's avatar
      drivers/w1/w1_int.c: call put_device if device_register fails · 112f24d2
      Levente Kurusa authored
      
      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: default avatarLevente Kurusa <levex@linux.com>
      Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      112f24d2
    • Arnaud Ebalard's avatar
      arm: dts: zynq: update isl9305 compatible string to use isil vendor prefix · 6129ca76
      Arnaud Ebalard authored
      
      "isil" and "isl" prefixes are used at various locations inside the kernel
      to reference Intersil corporation.  This patch is part of a series fixing
      those locations were "isl" is used in compatible strings to use the now
      expected "isil" prefix instead (NASDAQ symbol for Intersil and most used
      version).
      
      Note: isl9305 is an I2C device so the patch does not in fact currently
      depend on the introduction of "isil"-based compatible string in isl9305
      driver (provided by another patch) because I2C core does not check the
      prefix yet.
      
      Signed-off-by: default avatarArnaud Ebalard <arno@natisbad.org>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
      Cc: Kumar Gala <galak@codeaurora.org>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Stephen Warren <swarren@wwwdotorg.org>
      Cc: Thierry Reding <thierry.reding@gmail.com>
      Cc: Alexandre Courbot <gnurou@gmail.com>
      Cc: Uwe Kleine-Knig <uwe@kleine-koenig.org>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Cc: Peter Huewe <peter.huewe@infineon.com>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Mark Brown <broonie@kernel.org>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Darshana Padmadas <darshanapadmadas@gmail.com>
      Cc: Grant Likely <grant.likely@linaro.org>
      Cc: Rob Landley <rob@landley.net>
      Cc: Jason Cooper <jason@lakedaemon.net>
      Cc: Guenter Roeck <linux@roeck-us.net>
      Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
      Cc: Uwe Kleine-König <uwe@kleine-koenig.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      6129ca76
    • Arnaud Ebalard's avatar
      staging: iio: isl29028: deprecate use of isl in compatible string for isil · e768c5d1
      Arnaud Ebalard authored
      
      "isil" and "isl" prefixes are used at various locations inside the kernel
      to reference Intersil corporation.  This patch is part of a series fixing
      those locations were "isl" is used in compatible strings to use the now
      expected "isil" prefix instead (NASDAQ symbol for Intersil and most used
      version).  The old compatible string is kept for backward compatibility.
      
      Signed-off-by: default avatarArnaud Ebalard <arno@natisbad.org>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
      Cc: Kumar Gala <galak@codeaurora.org>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Stephen Warren <swarren@wwwdotorg.org>
      Cc: Thierry Reding <thierry.reding@gmail.com>
      Cc: Alexandre Courbot <gnurou@gmail.com>
      Cc: Uwe Kleine-Knig <uwe@kleine-koenig.org>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Cc: Peter Huewe <peter.huewe@infineon.com>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Mark Brown <broonie@kernel.org>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Darshana Padmadas <darshanapadmadas@gmail.com>
      Cc: Grant Likely <grant.likely@linaro.org>
      Cc: Rob Landley <rob@landley.net>
      Cc: Jason Cooper <jason@lakedaemon.net>
      Cc: Guenter Roeck <linux@roeck-us.net>
      Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
      Cc: Uwe Kleine-König <uwe@kleine-koenig.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      e768c5d1
    • Arnaud Ebalard's avatar
      rtc: isl12057: deprecate use of isl in compatible string for isil · fc31a04a
      Arnaud Ebalard authored
      
      "isil" and "isl" prefixes are used at various locations inside the kernel
      to reference Intersil corporation.  This patch is part of a series fixing
      those locations were "isl" is used in compatible strings to use the now
      expected "isil" prefix instead (NASDAQ symbol for Intersil and most used
      version).  The old compatible string is kept for backward compatibility.
      
      Signed-off-by: default avatarArnaud Ebalard <arno@natisbad.org>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
      Cc: Kumar Gala <galak@codeaurora.org>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Stephen Warren <swarren@wwwdotorg.org>
      Cc: Thierry Reding <thierry.reding@gmail.com>
      Cc: Alexandre Courbot <gnurou@gmail.com>
      Cc: Uwe Kleine-Knig <uwe@kleine-koenig.org>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Cc: Peter Huewe <peter.huewe@infineon.com>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Mark Brown <broonie@kernel.org>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Darshana Padmadas <darshanapadmadas@gmail.com>
      Cc: Grant Likely <grant.likely@linaro.org>
      Cc: Rob Landley <rob@landley.net>
      Cc: Jason Cooper <jason@lakedaemon.net>
      Cc: Guenter Roeck <linux@roeck-us.net>
      Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
      Cc: Uwe Kleine-König <uwe@kleine-koenig.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      fc31a04a
    • Arnaud Ebalard's avatar
      rtc: isl12022: deprecate use of isl in compatible string for isil · f5f8b14d
      Arnaud Ebalard authored
      
      "isil" and "isl" prefixes are used at various locations inside the kernel
      to reference Intersil corporation.  This patch is part of a series fixing
      those locations were "isl" is used in compatible strings to use the now
      expected "isil" prefix instead (NASDAQ symbol for Intersil and most used
      version).  The old compatible string is kept for backward compatibility.
      
      Signed-off-by: default avatarArnaud Ebalard <arno@natisbad.org>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
      Cc: Kumar Gala <galak@codeaurora.org>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Stephen Warren <swarren@wwwdotorg.org>
      Cc: Thierry Reding <thierry.reding@gmail.com>
      Cc: Alexandre Courbot <gnurou@gmail.com>
      Cc: Uwe Kleine-Knig <uwe@kleine-koenig.org>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Cc: Peter Huewe <peter.huewe@infineon.com>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Mark Brown <broonie@kernel.org>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Darshana Padmadas <darshanapadmadas@gmail.com>
      Cc: Grant Likely <grant.likely@linaro.org>
      Cc: Rob Landley <rob@landley.net>
      Cc: Jason Cooper <jason@lakedaemon.net>
      Cc: Guenter Roeck <linux@roeck-us.net>
      Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
      Cc: Uwe Kleine-König <uwe@kleine-koenig.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      f5f8b14d
    • Arnaud Ebalard's avatar
      dt-bindings: use isil prefix for Intersil · f98d88d5
      Arnaud Ebalard authored
      
      When Intersil ISL12057 driver was introduced by commit 70e12337 ("rtc:
      Add support for Intersil ISL12057 I2C RTC chip"), the vendor prefix 'isl'
      was used instead of the expected 'isil' (Intersil NASDAQ symbol) and
      documented in vendor-prefixes.txt.
      
      Recently, a patch from Philip Zabel (7a6540ca, "ARM: mvebu: Change
      vendor prefix for Intersil Corporation to isil") fixed that prefix in
      ReadyNAS devices .dts files (AFAICT, the only users of the driver).
      
      Then, commits 7c75c1d5 ("dt-bindings: Document deprecated device
      vendor name to fix related warning") and b2ea3f82 (dt-bindings:
      Document correct and deprecated vendor-prefix with device isl29028)
      decided to go the other way and deprecate isil in vendor-prefixes.txt and
      in isl29028.c staging driver.
      
      While trying and merge a fix I wrote for ISL12057 drivers to finish
      Philip's work, it conflicted with the two recently introduced commits, and
      revealed the issue: at the moment, there are various compatible strings in
      drivers and .dts files for Intersil products which use either isl or isil:
      
      $ grep -R "isil," .
      ./Documentation/devicetree/bindings/i2c/trivial-devices.txt:isil,isl29028           (deprecated, use isl)
      ./drivers/staging/iio/light/isl29028.c:   { .compatible = "isil,isl29028", },/* deprecated, don't use */
      ./drivers/staging/iio/light/isl29018.c:   { .compatible = "isil,isl29018", },
      ./drivers/staging/iio/light/isl29018.c:   { .compatible = "isil,isl29023", },
      ./drivers/staging/iio/light/isl29018.c:   { .compatible = "isil,isl29035", },
      ./arch/powerpc/boot/dts/p1022rdk.dts:        compatible = "isil,zl6100";
      ./arch/powerpc/boot/dts/p1022rdk.dts:        compatible = "isil,zl6100";
      ./arch/powerpc/boot/dts/p1022rdk.dts:        compatible = "isil,zl6100";
      ./arch/powerpc/boot/dts/p1022rdk.dts:        compatible = "isil,zl6100";
      ./arch/arm/boot/dts/exynos5800-peach-pi.dts: compatible = "isil,isl29018";
      ./arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi: compatible = "isil,isl1208";
      ./arch/arm/boot/dts/tegra20-ventana.dts:     compatible = "isil,isl29018";
      ./arch/arm/boot/dts/tegra20-seaboard.dts:    compatible = "isil,isl29018";
      ./arch/arm/boot/dts/armada-xp-netgear-rn2120.dts: compatible = "isil,isl12057";
      ./arch/arm/boot/dts/armada-370-netgear-rn104.dts: compatible = "isil,isl12057";
      ./arch/arm/boot/dts/exynos5420-peach-pit.dts:     compatible = "isil,isl29018";
      ./arch/arm/boot/dts/armada-370-netgear-rn102.dts: compatible = "isil,isl12057";
      
      $ grep -R "isl," .
      ./Documentation/devicetree/bindings/regulator/isl9305.txt:- compatible: "isl,isl9305" or "isl,isl9305h"
      ./Documentation/devicetree/bindings/regulator/isl9305.txt:              compatible = "isl,isl9305";
      ./Documentation/devicetree/bindings/i2c/trivial-devices.txt:isl,isl12057      Intersil ISL12057 I2C RTC Chip
      ./Documentation/devicetree/bindings/i2c/trivial-devices.txt:isl,isl29028      Intersil ISL29028 Ambient Light ....
      ./drivers/regulator/isl9305.c:          { .compatible = "isl,isl9305" },
      ./drivers/regulator/isl9305.c:          { .compatible = "isl,isl9305h" },
      ./drivers/staging/iio/light/isl29028.c: { .compatible = "isl,isl29028", },
      ./drivers/rtc/rtc-isl12057.c:           { .compatible = "isl,isl12057" },
      ./drivers/rtc/rtc-isl12022.c:           { .compatible = "isl,isl12022" },
      ./arch/arm/boot/dts/tegra30-cardhu.dtsi:   compatible = "isl,isl29028";
      ./arch/arm/boot/dts/zynq-parallella.dts:   compatible = "isl,isl9305";
      
      AFAICT, it seems it makes sense to *definitively* settle for isil as the
      vendor prefix for Intersil, as Philip did in 7a6540ca: it's the NASDAQ
      symbol and this choice requires less changes than opting for isl.
      
      So, this series changes compatible strings in .dts files to use isil where
      isl was found before, and modify drivers w/ compatible strings using isl
      to add one using isil.  In those cases, a comment is made that the old
      compatible string is kept for backward compatibility (w/ out-fo-tree users
      of those drivers).  Additionally, it leaves only isil as prefix in
      vendor-prefixes.txt.  Those changes should prevent any new inclusion of
      isl compatible strings for Intersil devices due to copy-and-paste.
      
      This patch (of 7):
      
      Fix DT documentation to reference isil (NASDAQ symbol and the most used
      prefix inside the kernel) for all Intersil products.
      
      It reverts both 7c75c1d5 ("dt-bindings: Document deprecated device
      vendor name to fix related warning") and b2ea3f82 ("dt-bindings:
      Document correct and deprecated vendor-prefix with device isl29028").
      
      Signed-off-by: default avatarArnaud Ebalard <arno@natisbad.org>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
      Cc: Kumar Gala <galak@codeaurora.org>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Stephen Warren <swarren@wwwdotorg.org>
      Cc: Thierry Reding <thierry.reding@gmail.com>
      Cc: Alexandre Courbot <gnurou@gmail.com>
      Cc: Uwe Kleine-Knig <uwe@kleine-koenig.org>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Cc: Peter Huewe <peter.huewe@infineon.com>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Mark Brown <broonie@kernel.org>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Darshana Padmadas <darshanapadmadas@gmail.com>
      Cc: Grant Likely <grant.likely@linaro.org>
      Cc: Rob Landley <rob@landley.net>
      Cc: Jason Cooper <jason@lakedaemon.net>
      Cc: Guenter Roeck <linux@roeck-us.net>
      Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
      Cc: Uwe Kleine-König <uwe@kleine-koenig.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      f98d88d5
    • Andrew Morton's avatar
      drivers/gpio/gpio-zevio.c: fix build · 6cfab85f
      Andrew Morton authored
      
      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: default avatarAndrew Morton <akpm@linux-foundation.org>
      6cfab85f
    • Stephen Rothwell's avatar
      Merge branch 'akpm-current/current' · f46d11d9
      Stephen Rothwell authored
      Conflicts:
      	drivers/misc/ti-st/st_core.c
      	mm/memory.c
      f46d11d9
    • Stephen Rothwell's avatar
    • Stephen Rothwell's avatar
    • Stephen Rothwell's avatar
      ec1fa6b3
    • Stephen Rothwell's avatar
      Merge remote-tracking branch 'y2038/y2038' · 602eb367
      Stephen Rothwell authored
      Conflicts:
      	drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
      	drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
      	drivers/staging/media/lirc/lirc_sasem.c
      602eb367
    • Stephen Rothwell's avatar
      51be5c58
    • Stephen Rothwell's avatar
    • Stephen Rothwell's avatar
      b34724a1
    • Stephen Rothwell's avatar
      361dcd8d
    • Stephen Rothwell's avatar
      647cdd2e
    • Stephen Rothwell's avatar
      f6b41406
    • Stephen Rothwell's avatar
      e703c840
    • Stephen Rothwell's avatar
      912caf9d
    • Stephen Rothwell's avatar
    • Stephen Rothwell's avatar
    • Stephen Rothwell's avatar
      Merge remote-tracking branch 'usb-gadget/next' · 5649a570
      Stephen Rothwell authored
      Conflicts:
      	drivers/usb/dwc2/gadget.c
      	drivers/usb/gadget/udc/bdc/bdc_ep.c
      5649a570
    • Stephen Rothwell's avatar
      89572ca9
    • Stephen Rothwell's avatar
      2c5df22d
    • Stephen Rothwell's avatar
      e1e994ad
    • Stephen Rothwell's avatar
      477b1651
    • Stephen Rothwell's avatar
      56b6cdd7
    • Stephen Rothwell's avatar
      954b1d9c
    • Stephen Rothwell's avatar
      d9880a3a
    • Stephen Rothwell's avatar
      e6dd13a1
    • Stephen Rothwell's avatar
      602bc989
    • Stephen Rothwell's avatar
      ec31ba42
    • Stephen Rothwell's avatar
      e9147ff0
    • Stephen Rothwell's avatar
    • Stephen Rothwell's avatar
      4b875fa0
    • Stephen Rothwell's avatar
      1ef9ed8e
Loading