1. 26 6月, 2014 6 次提交
    • L
      Merge tag 'nfs-for-3.16-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · ec71feae
      Linus Torvalds 提交于
      Pull NFS client fixes from Trond Myklebust:
       "Highlights include:
      
         - Stable fix for a data corruption case due to incorrect cache
           validation
         - Fix a couple of false positive cache invalidations
         - Fix NFSv4 security negotiation issues"
      
      * tag 'nfs-for-3.16-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFSv4: test SECINFO RPC_AUTH_GSS pseudoflavors for support
        NFS Return -EPERM if no supported or matching SECINFO flavor
        NFS check the return of nfs4_negotiate_security in nfs4_submount
        NFS: Don't mark the data cache as invalid if it has been flushed
        NFS: Clear NFS_INO_REVAL_PAGECACHE when we update the file size
        nfs: Fix cache_validity check in nfs_write_pageuptodate()
      ec71feae
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 456febd2
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Arnd Bergmann:
       "A new set of bug fixes for 3.16, containing patches for seven
        platforms:
      
        at91:
          - drivers/misc fix for Kconfig PWM symbol
          - correction of several values in DT after conversion to CCF
          - fix at91sam9261/at91sam9261ek mistake in slow crystal vs. slow RC osc
      
        imx:
          - Use GPIO for card CD/WP on imx51-babbage and eukrea-mbimxsd51,
            because controller base CD/WP is not working in esdhc driver due to
            runtime PM support
          - A couple of random ventana gw5xxx board fixes
          - Add IMX_IPUV3_CORE back to defconfig, which gets lost when moving
            IPUv3 driver out of staging tree
          - Fix enet/fec clock selection on imx6sl
          - Fix display node on imx53-m53evk board
          - A couple of Cubox-i updates from Russell, which were omitted from
            the merge window due to dependency
      
        integrator:
          - fix an OF-related regression against 3.15
      
        mvebu:
          - mvebu (v7)
             - Fix broken SoC ID detection
             - Select ARM_CPU_SUSPEND for v7
             - Remove armada38x compatible string (no users yet)
             - Enable Dove SoC in mvebu_v7_defconfig
          - kirkwood
             - Fix phy-connection-type on GuruPlug board
      
        qcom:
          - enable gsbi driver in defconfig
          - fix section mismatch warning in serial driver
      
        samsung:
          - use WFI macro in platform_do_lowpower because exynos cpuhotplug
            includes a hardcoded WFI instruction and it causes compile error
            in Thumb-2 mode.
          - fix GIC reg sizes for exynos4 SoCs
          - remove reset timer counter value during boot and resume for mct
            to fix a big jump in printk timestamps
          - fix pm code to check cortex-A9 for another exynos SoCs
          - don't rely on firmware's secondary_cpu_start for mcpm
      
        sti:
          - Ethernet clocks were wrongly defined for STiH415/416 platforms
          - STiH416 B2020 revision E DTS file name contained uppercase, change to
            lowercase"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (33 commits)
        ARM: at91/dt: sam9261: remove slow RC osc
        ARM: at91/dt: define sam9261ek slow crystal frequency
        ARM: at91/dt: sam9261: correctly define mainck
        ARM: at91/dt: sam9n12: correct PLLA ICPLL and OUT values
        ARM: at91/dt: sam9x5: correct PLLA ICPLL and OUT values
        misc: atmel_pwm: fix Kconfig symbols
        ARM: integrator: fix OF-related regression
        ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard
        ARM: dts: kirkwood: fix phy-connection-type for Guruplug
        ARM: EXYNOS: Don't rely on firmware's secondary_cpu_start for mcpm
        ARM: dts: imx51-eukrea-mbimxsd51-baseboard: unbreak esdhc.
        ARM: dts: imx51-babbage: Fix esdhc setup
        ARM: dts: mx5: Move the display out of soc {} node
        ARM: dts: mx5: Fix IPU port node placement
        ARM: mvebu: select ARM_CPU_SUSPEND for Marvell EBU v7 platforms
        ARM: mvebu: Fix broken SoC ID detection
        ARM: imx_v6_v7_defconfig: Enable CONFIG_IMX_IPUV3_CORE
        ARM: multi_v7_defconfig: Add QCOM GSBI driver
        ARM: stih41x: Rename stih416-b2020-revE.dts to stih416-b2020e.dts
        tty: serial: msm: Fix section mismatch warning
        ...
      456febd2
    • A
      Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes · 6c9d1617
      Arnd Bergmann 提交于
      Merge "First AT91 fixes batch for 3.16" from Nicolas Ferre:
      
      - drivers/misc fix for Kconfig PWM symbol
      - correction of several values in DT after conversion to CCF
      - fix at91sam9261/at91sam9261ek mistake in slow crystal vs. slow RC osc
      
      * tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
        ARM: at91/dt: sam9261: remove slow RC osc
        ARM: at91/dt: define sam9261ek slow crystal frequency
        ARM: at91/dt: sam9261: correctly define mainck
        ARM: at91/dt: sam9n12: correct PLLA ICPLL and OUT values
        ARM: at91/dt: sam9x5: correct PLLA ICPLL and OUT values
        misc: atmel_pwm: fix Kconfig symbols
      6c9d1617
    • A
      Merge tag 'mvebu-fixes-3.16' of git://git.infradead.org/linux-mvebu into fixes · 6d12e796
      Arnd Bergmann 提交于
      Merge "mvebu fixes for v3.16" from Jason Cooper:
      
       - mvebu
          - Fix broken SoC ID detection
          - Select ARM_CPU_SUSPEND for v7
          - Remove armada38x compatible string (no users yet)
      
       - kirkwood
          - Fix phy-connection-type on GuruPlug board
      
      * tag 'mvebu-fixes-3.16' of git://git.infradead.org/linux-mvebu:
        ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard
        ARM: dts: kirkwood: fix phy-connection-type for Guruplug
        ARM: mvebu: select ARM_CPU_SUSPEND for Marvell EBU v7 platforms
        ARM: mvebu: Fix broken SoC ID detection
      6d12e796
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 15e52d9a
      Linus Torvalds 提交于
      Pull Ceph fix from Sage Weil:
       "This fixes a corner case for cloned RBD images"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        rbd: handle parent_overlap on writes correctly
      15e52d9a
    • A
      ARM: at91/dt: sam9261: remove slow RC osc · 971dc9ce
      Alexandre Belloni 提交于
      The at91sam9261 doesn't actually have a slow RC oscillator, remove it from the
      dtsi.
      Signed-off-by: NAlexandre Belloni <alexandre.belloni@free-electrons.com>
      Acked-by: NBoris BREZILLON <boris.brezillon@free-electrons.com>
      Signed-off-by: NNicolas Ferre <nicolas.ferre@atmel.com>
      971dc9ce
  2. 25 6月, 2014 21 次提交
  3. 24 6月, 2014 13 次提交