1. 09 Oct, 2015 2 commits
    • Arnd Bergmann's avatar
      Merge tag 'arm-soc/for-4.4/devicetree' of http://github.com/Broadcom/stblinux into next/dt · d749d94b
      Arnd Bergmann authored
      Merge "Broadcom devicetree changes for v4.4" from Florian Fainelli:
      
      This pull requests contains the following Broadcom SoCs Device Tree changes:
      
      - Brian Norris documents the BCM7445 SoCs Power Management controllers and
        hardware and updates the reference BCM7445 Device Tree with these nodes
      
      - Florian Fainelli documents the BCM7xxx write-pairing feature in the top-level
        BCM7xxx binding document
      
      - Hauke Merthens enables the NAND controller for the Asus RT-AC87U and adds the
        GPIO pin controlling the USB power supply on Netgear R6250
      
      - Jon Mason adds support for the NorthStar Plus SoC by providing a top-level
        binding document and the minimalist device tree skeleton for these SoCs
      
      - Rafal Milecki adds support for the Netgear R7000 (BCM5301x SoC)
      
      - Ray Jui provides a set of Cygnus DT changes that make the Device Tree clearer
        and more correct with respect to how the hardware is designed. He also enables
        the NAND controller on the bcm911360_entphn design, enables a bunch of
        peripherals on the bcm958305k evaluation board, and adds a skeleton .dtsi file
        for the touchscreen extansion board(s)
      
      * tag 'arm-soc/for-4.4/devicetree' of http://github.com/Broadcom/stblinux:
        ARM: dts: move aliases back to .dts in Cygnus
        ARM: dts: fix Cygnus nand device node
        ARM: dts: enable touchscreen support on Cygnus
        ARM: dts: Enable NAND support on bcm911360_entphn
        ARM: dts: Enable various peripherals on bcm958305k
        ARM: dts: Reorder Cygnus peripherals
        ARM: dts: Move all Cygnus peripherals into axi bus
        ARM: dts: Put Cygnus core components under core bus
        ARM: dts: Use label for device nodes in Cygnus dts
        ARM: dts: consolidate aliases for Cygnus dt files
        ARM: BCM5301X: Netgear R6250 add USB GPIO
        Documentation: bindings: brcmstb: Document write-pairing
        ARM: dts: brcmstb: add BCM7445 system PM DT nodes
        Documentation: dt: brcmstb: add system PM bindings
        ARM: BCM5301X: add NAND flash chip description for Asus RT-AC87U
        ARM: BCM5301X: Add DT for Netgear R7000
        ARM: NSP: add minimal Northstar Plus device tree
        dt-bindings: Create Documentation for NSP DT bindings
      d749d94b
    • Arnd Bergmann's avatar
      Merge tag 'v4.4-rockchip-dts32-1' of... · d27199cb
      Arnd Bergmann authored
      Merge tag 'v4.4-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
      
      Merge "Rockchip dts32 changes for 4.4" from Heiko Stuebner:
      
      DTS changes including one new Veyron-board and the Radxa Rock2
      system-on-module as well as the square baseboard. On top of that
      a lot of mmc-related changes to improve speeds on the Cortex-A9
      socs and also setting up the supplies for rk3288 mmc-controllers
      for the following mmc-tuning support. And of course the dts-part
      of the rk3288 power-domains.
      
      * tag 'v4.4-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
        ARM: dts: rockchip: add the support power-domain node on RK3288 SoCs
        ARM: dts: rockchip: add rk3288-firefly iodomains
        ARM: dts: rockchip: fixup firefly mmc supplies
        ARM: dts: rockchip: add rk3288-popmetal iodomains
        ARM: dts: rockchip: add rk3288-popmetal mmc supplies
        ARM: dts: rockchip: add rk3288-popmetal board to dtb list
        ARM: dts: rockchip: Add dtb for the Radxa Rock 2 Square board
        ARM: dts: rockchip: support highspeed sd-cards on rk3066a boards
        ARM: dts: rockchip: support highspeed sd-cards for rk3188-radxarock
        ARM: dts: rockchip: Add the hdmi-ddc pinctrl settings for rk3288
        ARM: dts: rockchip: Remove specific cts pullup from veyron
        ARM: dts: rockchip: pull up cts lines on rk3288
        ARM: dts: rockchip: add veyron-jaq board
        ARM: dts: rockchip: Add support for SD/MMC on MarsBoard-RK3066
        dt-bindings: add power-domain header for RK3288 SoCs
      d27199cb
  2. 08 Oct, 2015 21 commits
  3. 06 Oct, 2015 13 commits
  4. 05 Oct, 2015 2 commits
  5. 04 Oct, 2015 2 commits
    • Linus Torvalds's avatar
      Linux 4.3-rc4 · 049e6dde
      Linus Torvalds authored
      049e6dde
    • Linus Torvalds's avatar
      Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 30c44659
      Linus Torvalds authored
      Pull strscpy string copy function implementation from Chris Metcalf.
      
      Chris sent this during the merge window, but I waffled back and forth on
      the pull request, which is why it's going in only now.
      
      The new "strscpy()" function is definitely easier to use and more secure
      than either strncpy() or strlcpy(), both of which are horrible nasty
      interfaces that have serious and irredeemable problems.
      
      strncpy() has a useless return value, and doesn't NUL-terminate an
      overlong result.  To make matters worse, it pads a short result with
      zeroes, which is a performance disaster if you have big buffers.
      
      strlcpy(), by contrast, is a mis-designed "fix" for strlcpy(), lacking
      the insane NUL padding, but having a differently broken return value
      which returns the original length of the source string.  Which means
      that it will read characters past the count from the source buffer, and
      you have to trust the source to be properly terminated.  It also makes
      error handling fragile, since the test for overflow is unnecessarily
      subtle.
      
      strscpy() avoids both these problems, guaranteeing the NUL termination
      (but not excessive padding) if the destination size wasn't zero, and
      making the overflow condition very obvious by returning -E2BIG.  It also
      doesn't read past the size of the source, and can thus be used for
      untrusted source data too.
      
      So why did I waffle about this for so long?
      
      Every time we introduce a new-and-improved interface, people start doing
      these interminable series of trivial conversion patches.
      
      And every time that happens, somebody does some silly mistake, and the
      conversion patch to the improved interface actually makes things worse.
      Because the patch is mindnumbing and trivial, nobody has the attention
      span to look at it carefully, and it's usually done over large swatches
      of source code which means that not every conversion gets tested.
      
      So I'm pulling the strscpy() support because it *is* a better interface.
      But I will refuse to pull mindless conversion patches.  Use this in
      places where it makes sense, but don't do trivial patches to fix things
      that aren't actually known to be broken.
      
      * 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tile: use global strscpy() rather than private copy
        string: provide strscpy()
        Make asm/word-at-a-time.h available on all architectures
      30c44659