1. 13 4月, 2016 35 次提交
  2. 11 4月, 2016 5 次提交
    • L
      Linux 4.6-rc3 · bf162006
      Linus Torvalds 提交于
      bf162006
    • L
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 08b15d13
      Linus Torvalds 提交于
      Pull ARM fixes from Russell King:
       "A couple of small fixes, and wiring up the new syscalls which appeared
        during the merge window"
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8550/1: protect idiv patching against undefined gcc behavior
        ARM: wire up preadv2 and pwritev2 syscalls
        ARM: SMP enable of cache maintanence broadcast
      08b15d13
    • L
      Merge tag 'mmc-v4.6-rc1' of git://git.linaro.org/people/ulf.hansson/mmc · 2f422f94
      Linus Torvalds 提交于
      Pull MMC fixes from Ulf Hansson:
       "Here are a couple of mmc fixes intended for v4.6 rc3:
      
        MMC host:
         - sdhci: Fix regression setting power on Trats2 board
         - sdhci-pci: Add support and PCI IDs for more Broxton host controllers"
      
      * tag 'mmc-v4.6-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
        mmc: sdhci-pci: Add support and PCI IDs for more Broxton host controllers
        mmc: sdhci: Fix regression setting power on Trats2 board
      2f422f94
    • L
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 6a7c9243
      Linus Torvalds 提交于
      Pull i2c fixes from Wolfram Sang:
       "Some bugfixes from I2C:
      
         - fix a uevent triggered boot problem by removing a useless debug
           print
      
         - fix sysfs-attributes of the new i2c-demux-pinctrl driver to follow
           standard kernel behaviour
      
         - fix a potential division-by-zero error (needed two takes)"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: jz4780: really prevent potential division by zero
        Revert "i2c: jz4780: prevent potential division by zero"
        i2c: jz4780: prevent potential division by zero
        i2c: mux: demux-pinctrl: Update docs to new sysfs-attributes
        i2c: mux: demux-pinctrl: Clean up sysfs attributes
        i2c: prevent endless uevent loop with CONFIG_I2C_DEBUG_CORE
      6a7c9243
    • L
      Revert "ext4: allow readdir()'s of large empty directories to be interrupted" · 9f2394c9
      Linus Torvalds 提交于
      This reverts commit 1028b55b.
      
      It's broken: it makes ext4 return an error at an invalid point, causing
      the readdir wrappers to write the the position of the last successful
      directory entry into the position field, which means that the next
      readdir will now return that last successful entry _again_.
      
      You can only return fatal errors (that terminate the readdir directory
      walk) from within the filesystem readdir functions, the "normal" errors
      (that happen when the readdir buffer fills up, for example) happen in
      the iterorator where we know the position of the actual failing entry.
      
      I do have a very different patch that does the "signal_pending()"
      handling inside the iterator function where it is allowable, but while
      that one passes all the sanity checks, I screwed up something like four
      times while emailing it out, so I'm not going to commit it today.
      
      So my track record is not good enough, and the stars will have to align
      better before that one gets committed.  And it would be good to get some
      review too, of course, since celestial alignments are always an iffy
      debugging model.
      
      IOW, let's just revert the commit that caused the problem for now.
      Reported-by: NGreg Thelen <gthelen@google.com>
      Cc: Theodore Ts'o <tytso@mit.edu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9f2394c9