1. 07 May, 2015 6 commits
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v4.1/fixes-rc1' of... · 443318e0
      Arnd Bergmann authored
      Merge tag 'omap-for-v4.1/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Merge "omap fixes against v4.1-rc1" from Tony Lindgren:
      
      Fixes for omaps, mostly a fix for power power consumption
      creeping up during idle, and two l3-noc device fixes:
      
      - Fix power consumption creeping up with I2C4 staying on
      - Fix n900 microphone bias voltages
      - Fix dra7 l3-noc for host clock
      - Fix omap5 l3-noc id address decoding
      
      The rest are all just minor dts fixes:
      
      - Fix changed EXTCON_USB_GPIO_USB in defconfig
      - Fix missing isp and iva #iommu-cells property
      - Various beagle x15 dts fixes for pre-production changes
      - Fix am437x-sk display dts entries
      
      * tag 'omap-for-v4.1/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        bus: omap_l3_noc: Fix master id address decoding for OMAP5
        bus: omap_l3_noc: Fix offset for DRA7 CLK1_HOST_CLK1_2 instance
        ARM: dts: dra7: Fix efuse register size for ABB
        ARM: dts: am57xx-beagle-x15: Switch GPIO fan number
        ARM: dts: am57xx-beagle-x15: Switch UART mux pins
        ARM: dts: am437x-sk: reduce col-scan-delay-us
        ARM: dts: am437x-sk: fix for new newhaven display module revision
        ARM: dts: am57xx-beagle-x15: Fix RTC aliases
        ARM: dts: am57xx-beagle-x15: Fix IRQ type for mcp7941x
        ARM: dts: omap3: Add #iommu-cells to isp and iva iommu
        ARM: omap2plus_defconfig: Enable EXTCON_USB_GPIO
        ARM: dts: OMAP3-N900: Add microphone bias voltages
        ARM: OMAP2+: Fix omap off idle power consumption creeping up
      443318e0
    • Arnd Bergmann's avatar
      Merge tag 'arm-soc/for-4.1/maintainers' of http://github.com/broadcom/stblinux into fixes · d6ad446d
      Arnd Bergmann authored
      Merge "MAINTAINERS update for Broadcom SoCs for 4.1 #2" from Florian Fainelli:
      
      This pull request contains 3 changes to the MAINTAINERS file for Broadcom SoCs:
      
      - add Ray and Scott for mach-bcm
      - remove Christian for mach-bcm
      - remove Marc for brcmstb
      
      * tag 'arm-soc/for-4.1/maintainers' of http://github.com/broadcom/stblinux:
        MAINTAINERS: Update brcmstb entry
        MAINTAINERS: Remove Christian Daudt for mach-bcm
        MAINTAINERS: Update mach-bcm maintainers list
      d6ad446d
    • Arnd Bergmann's avatar
      Merge tag 'mvebu-fixes-4.1' of git://git.infradead.org/linux-mvebu into fixes · 654758ae
      Arnd Bergmann authored
      Pull "mvebu fix for 4.1" from Gregory CLEMENT:
      
      Disable the unused internal RTC in the dts of the OpenBlock AX3
      
      * tag 'mvebu-fixes-4.1' of git://git.infradead.org/linux-mvebu:
        ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC
      654758ae
    • Arnd Bergmann's avatar
      Merge tag 'fixes-for-v4.1-rc2' of https://github.com/rjarzmik/linux into fixes · 1be518bd
      Arnd Bergmann authored
      Merged "ARM: pxa: fixes for v4.1-rc2" from Robert Jarzmik:
      
      These fixes reenable the lubbock(pxa25x) and mainstone(pxa27x)
      platforms, which were broken since the gpio handling was
      converted to a driver, and the interrupt ordering broke the
      external interrupts of these systems.
      
      * tag 'fixes-for-v4.1-rc2' of https://github.com/rjarzmik/linux:
        ARM: pxa: lubbock: use new pxa_cplds driver
        ARM: pxa: mainstone: use new pxa_cplds driver
        ARM: pxa: pxa_cplds: add lubbock and mainstone IO
      1be518bd
    • Arnd Bergmann's avatar
      Merge tag 'imx-fixes-4.1' of... · c92b83a8
      Arnd Bergmann authored
      Merge tag 'imx-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
      
      Pull "The i.MX fixes for 4.1" from Shawn Guo:
      
       - A couple of imx23-olinuxino device tree fixes regarding to LED GPIO
         polarity and USB dr_mode setting
       - One i.MX28 device tree fix on AUART4 TX-DMA interrupt name
       - Add missing pwm-cells to PWM4 for i.MX25 device tree
       - Fix imx6q-phytec device tree to get correct USB VBUS control
       - Drop invalid pinctrl-assert-gpios property from imx6qdl-sabreauto
         device tree, which was sneaked in from vendor device tree
       - One fix on Wolfram's broken email address
      
      * tag 'imx-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
        ARM: dts: imx6qdl-sabreauto: remove pinctrl-assert-gpios
        ARM: dts: imx28: Fix AUART4 TX-DMA interrupt name
        ARM: dts: imx25: Add #pwm-cells to pwm4
        ARM: dts: imx6: phyFLEX: USB VBUS control is active-high
        ARM: mach-imx: devices: platform-sdhci-esdhc-imx: fix broken email address
        ARM: dts: imx23-olinuxino: Fix dr_mode of usb0
        ARM: dts: imx23-olinuxino: Fix polarity of LED GPIO
      c92b83a8
    • Arnd Bergmann's avatar
      Merge tag 'v4.1-rockchip-socfixes1' of... · d6bcc806
      Arnd Bergmann authored
      Merge tag 'v4.1-rockchip-socfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes
      
      Merge "ARM: rockchip: some soc-level fixes for 4.1" from Heiko Stübner:
      
      Two fixes from Chris Zhong, fixing some suspend oddities.
      And I've given up on the timer7 issue. While I initially thought
      devices would either have both the grave mmu issue requiring a uboot
      update and the timer7 issue or none, it looks like in all units in the
      field the mmu issue got fixed while the timer7 issue stayed on.
      So instead of making everybody wanting to use mainline jump through a
      hoop just make sure timer7 is on on boot before we init the arch-timer.
      
      * tag 'v4.1-rockchip-socfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
        rockchip: make sure timer7 is enabled on rk3288 platforms
        ARM: rockchip: fix undefined instruction of reset_ctrl_regs
        ARM: rockchip: disable dapswjdp during suspend
      d6bcc806
  2. 04 May, 2015 16 commits
  3. 03 May, 2015 8 commits
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2015-04-30' of git://anongit.freedesktop.org/drm-intel into drm-fixes · 71aee819
      Dave Airlie authored
      Just a single intel fix
      * tag 'drm-intel-fixes-2015-04-30' of git://anongit.freedesktop.org/drm-intel:
        drm/i915/chv: Implement WaDisableShadowRegForCpd
      71aee819
    • Dave Airlie's avatar
      Merge branch 'drm-next0420' of https://github.com/markyzq/kernel-drm-rockchip into drm-fixes · df9ebeb2
      Dave Airlie authored
      one fix and maintainers update
      * 'drm-next0420' of https://github.com/markyzq/kernel-drm-rockchip:
        drm/rockchip: fix error check when getting irq
        MAINTAINERS: add entry for Rockchip drm drivers
      df9ebeb2
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 61f06db0
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This is three logical fixes (as 5 patches).
      
        The 3ware class of drivers were causing an oops with multiqueue by
        tearing down the command mappings after completing the command (where
        the variables in the command used to tear down the mapping were
        no-longer valid).  There's also a fix for the qnap iscsi target which
        was choking on us sending it commands that were too long and a fix for
        the reworked aha1542 allocating GFP_KERNEL under a lock"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        3w-9xxx: fix command completion race
        3w-xxxx: fix command completion race
        3w-sas: fix command completion race
        aha1542: Allocate memory before taking a lock
        SCSI: add 1024 max sectors black list flag
      61f06db0
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma · 33332224
      Linus Torvalds authored
      Pull slave dmaengine fixes from Vinod Koul:
       "Here are the fixes in dmaengine subsystem for rc2:
      
         - privatecnt fix for slave dma request API by Christopher
      
         - warn fix for PM ifdef in usb-dmac by Geert
      
         - fix hardware dependency for xgene by Jean"
      
      * 'next' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: increment privatecnt when using dma_get_any_slave_channel
        dmaengine: xgene: Set hardware dependency
        dmaengine: usb-dmac: Protect PM-only functions to kill warning
      33332224
    • Linus Torvalds's avatar
      Merge tag 'powerpc-4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 180d89f6
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
       - build fix for SMP=n in book3s_xics.c
       - fix for Daniel's pci_controller_ops on powernv.
       - revert the TM syscall abort patch for now.
       - CPU affinity fix from Nathan.
       - two EEH fixes from Gavin.
       - fix for CR corruption from Sam.
       - selftest build fix.
      
      * tag 'powerpc-4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc/powernv: Restore non-volatile CRs after nap
        powerpc/eeh: Delay probing EEH device during hotplug
        powerpc/eeh: Fix race condition in pcibios_set_pcie_reset_state()
        powerpc/pseries: Correct cpu affinity for dlpar added cpus
        selftests/powerpc: Fix the pmu install rule
        Revert "powerpc/tm: Abort syscalls in active transactions"
        powerpc/powernv: Fix early pci_controller_ops loading.
        powerpc/kvm: Fix SMP=n build error in book3s_xics.c
      180d89f6
    • Jan Kara's avatar
      ext4: fix growing of tiny filesystems · 2c869b26
      Jan Kara authored
      The estimate of necessary transaction credits in ext4_flex_group_add()
      is too pessimistic. It reserves credit for sb, resize inode, and resize
      inode dindirect block for each group added in a flex group although they
      are always the same block and thus it is enough to account them only
      once. Also the number of modified GDT block is overestimated since we
      fit EXT4_DESC_PER_BLOCK(sb) descriptors in one block.
      
      Make the estimation more precise. That reduces number of requested
      credits enough that we can grow 20 MB filesystem (which has 1 MB
      journal, 79 reserved GDT blocks, and flex group size 16 by default).
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
      Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
      2c869b26
    • Davide Italiano's avatar
      ext4: move check under lock scope to close a race. · 280227a7
      Davide Italiano authored
      fallocate() checks that the file is extent-based and returns
      EOPNOTSUPP in case is not. Other tasks can convert from and to
      indirect and extent so it's safe to check only after grabbing
      the inode mutex.
      Signed-off-by: default avatarDavide Italiano <dccitaliano@gmail.com>
      Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
      Cc: stable@vger.kernel.org
      280227a7
    • Lukas Czerner's avatar
      ext4: fix data corruption caused by unwritten and delayed extents · d2dc317d
      Lukas Czerner authored
      Currently it is possible to lose whole file system block worth of data
      when we hit the specific interaction with unwritten and delayed extents
      in status extent tree.
      
      The problem is that when we insert delayed extent into extent status
      tree the only way to get rid of it is when we write out delayed buffer.
      However there is a limitation in the extent status tree implementation
      so that when inserting unwritten extent should there be even a single
      delayed block the whole unwritten extent would be marked as delayed.
      
      At this point, there is no way to get rid of the delayed extents,
      because there are no delayed buffers to write out. So when a we write
      into said unwritten extent we will convert it to written, but it still
      remains delayed.
      
      When we try to write into that block later ext4_da_map_blocks() will set
      the buffer new and delayed and map it to invalid block which causes
      the rest of the block to be zeroed loosing already written data.
      
      For now we can fix this by simply not allowing to set delayed status on
      written extent in the extent status tree. Also add WARN_ON() to make
      sure that we notice if this happens in the future.
      
      This problem can be easily reproduced by running the following xfs_io.
      
      xfs_io -f -c "pwrite -S 0xaa 4096 2048" \
                -c "falloc 0 131072" \
                -c "pwrite -S 0xbb 65536 2048" \
                -c "fsync" /mnt/test/fff
      
      echo 3 > /proc/sys/vm/drop_caches
      xfs_io -c "pwrite -S 0xdd 67584 2048" /mnt/test/fff
      
      This can be theoretically also reproduced by at random by running fsx,
      but it's not very reliable, though on machines with bigger page size
      (like ppc) this can be seen more often (especially xfstest generic/127)
      Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
      Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
      Cc: stable@vger.kernel.org
      d2dc317d
  4. 02 May, 2015 7 commits
  5. 01 May, 2015 3 commits
    • Ilya Dryomov's avatar
      rbd: end I/O the entire obj_request on error · 082a75da
      Ilya Dryomov authored
      When we end I/O struct request with error, we need to pass
      obj_request->length as @nr_bytes so that the entire obj_request worth
      of bytes is completed.  Otherwise block layer ends up confused and we
      trip on
      
          rbd_assert(more ^ (which == img_request->obj_request_count));
      
      in rbd_img_obj_callback() due to more being true no matter what.  We
      already do it in most cases but we are missing some, in particular
      those where we don't even get a chance to submit any obj_requests, due
      to an early -ENOMEM for example.
      
      A number of obj_request->xferred assignments seem to be redundant but
      I haven't touched any of obj_request->xferred stuff to keep this small
      and isolated.
      
      Cc: Alex Elder <elder@linaro.org>
      Cc: stable@vger.kernel.org # 3.10+
      Reported-by: default avatarShawn Edwards <lesser.evil@gmail.com>
      Reviewed-by: default avatarSage Weil <sage@redhat.com>
      Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
      082a75da
    • Theodore Ts'o's avatar
      ext4 crypto: add padding to filenames before encrypting · a44cd7a0
      Theodore Ts'o authored
      This obscures the length of the filenames, to decrease the amount of
      information leakage.  By default, we pad the filenames to the next 4
      byte boundaries.  This costs nothing, since the directory entries are
      aligned to 4 byte boundaries anyway.  Filenames can also be padded to
      8, 16, or 32 bytes, which will consume more directory space.
      
      Change-Id: Ibb7a0fb76d2c48e2061240a709358ff40b14f322
      Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
      a44cd7a0
    • Theodore Ts'o's avatar
      ext4 crypto: simplify and speed up filename encryption · 5de0b4d0
      Theodore Ts'o authored
      Avoid using SHA-1 when calculating the user-visible filename when the
      encryption key is available, and avoid decrypting lots of filenames
      when searching for a directory entry in a directory block.
      
      Change-Id: If4655f144784978ba0305b597bfa1c8d7bb69e63
      Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
      5de0b4d0