1. 05 10月, 2017 6 次提交
    • L
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 42b76d0e
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "Our first batch of fixes this release cycle, unfortunately a bit
        noisier than usual. Two major groups stand out:
      
         - Some pinctril dts/dtsi changes for stm32 due to a new driver being
           merged during the merge window, and this aligns the DT contents
           between the old format and the new. This could arguably be moved to
           the next merge window but it also seemed relatively harmless to
           include now.
      
         - Amlogic/meson had driver changes merged that required devicetree
           changes to avoid functional/performance regressions. I've already
           asked them to be more careful about this going forward, and making
           sure drivers are compatible with older DTs when they make these
           kind of changes. The platform is actively being upstreamed so
           there's a few things in flight, we've seen this happen before and
           sometimes it's hard to catch in time.
      
        Besides that there is the usual mix of minor fixes"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (33 commits)
        ARM: dts: stm32: use right pinctrl compatible for stm32f469
        ARM: dts: stm32: Fix STMPE1600 binding on stm32429i-eval board
        ARM: defconfig: update Gemini defconfig
        ARM: defconfig: FRAMEBUFFER_CONSOLE can no longer be =m
        arm64: dts: rockchip: add the grf clk for dw-mipi-dsi on rk3399
        reset: Restrict RESET_HSDK to ARC_SOC_HSDK or COMPILE_TEST
        ARM: dts: da850-evm: add serial and ethernet aliases
        ARM: dts: am43xx-epos-evm: Remove extra CPSW EMAC entry
        ARM: dts: am33xx: Add spi alias to match SOC schematics
        ARM: OMAP2+: hsmmc: fix logic to call either omap_hsmmc_init or omap_hsmmc_late_init but not both
        ARM: dts: dra7: Set a default parent to mcasp3_ahclkx_mux
        ARM: OMAP2+: dra7xx: Set OPT_CLKS_IN_RESET flag for gpio1
        ARM: dts: nokia n900: drop unneeded/undocumented parts of the dts
        arm64: dts: rockchip: Correct MIPI DPHY PLL clock on rk3399
        arm64: dt marvell: Fix AP806 system controller size
        MAINTAINERS: add Macchiatobin maintainers entry
        ARC: reset: remove the misleading v1 suffix all over
        ARC: reset: add missing DT binding documentation for HSDKv1 reset driver
        ARC: reset: Only build on archs that have IOMEM
        ARM: at91: Replace uses of virt_to_phys with __pa_symbol
        ...
      42b76d0e
    • J
      Update James Hogan's email address · e0a86312
      James Hogan 提交于
      Update my imgtec.com and personal email address to my kernel.org one in
      a few places as MIPS will soon no longer be part of Imagination
      Technologies, and add mappings in .mailcap so get_maintainer.pl reports
      the right address.
      Signed-off-by: NJames Hogan <jhogan@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e0a86312
    • O
      Merge tag 'stm32-dt-fixes-for-v4.14' of... · 08f8c880
      Olof Johansson 提交于
      Merge tag 'stm32-dt-fixes-for-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into fixes
      
      STM32 fixes for v4.14:
      ---------------------
      
      -Fix STMPE1600 bindings for stm32429i-eval board
      -Use right compatible for stm32f469 pinctrl. It implies to use
      pinctrl dedicated files for F4 SoCs.
      
      * tag 'stm32-dt-fixes-for-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
        ARM: dts: stm32: use right pinctrl compatible for stm32f469
        ARM: dts: stm32: Fix STMPE1600 binding on stm32429i-eval board
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      08f8c880
    • O
      Merge tag 'amlogic-dt64-3' of... · eab5c002
      Olof Johansson 提交于
      Merge tag 'amlogic-dt64-3' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes
      
      Amlogic 64-bit DT updates for v4.14 (round 3)
      - updates for new MMC driver features/fixes
      - support high-speed modes
      
      * tag 'amlogic-dt64-3' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
        ARM64: dts: meson-gxbb: nanopi-k2: enable sdr104 mode
        ARM64: dts: meson-gxbb: nanopi-k2: enable sdcard UHS modes
        ARM64: dts: meson-gxbb: p20x: enable sdcard UHS modes
        ARM64: dts: meson-gxl: libretech-cc: enable high speed modes
        ARM64: dts: meson-gxl: libretech-cc: add card regulator settle times
        ARM64: dts: meson-gxbb: nanopi-k2: add card regulator settle times
        ARM64: dts: meson: add mmc clk gate pins
        ARM64: dts: meson: remove cap-sd-highspeed from emmc nodes
        ARM64: dts: meson-gx: Use correct mmc clock source 0
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      eab5c002
    • L
      Merge branch 'akpm' (patches from Andrew) · b7e14164
      Linus Torvalds 提交于
      Merge misc fixes from Andrew Morton:
       "A lot of stuff, sorry about that. A week on a beach, then a bunch of
        time catching up then more time letting it bake in -next. Shan't do
        that again!"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (51 commits)
        include/linux/fs.h: fix comment about struct address_space
        checkpatch: fix ignoring cover-letter logic
        m32r: fix build failure
        lib/ratelimit.c: use deferred printk() version
        kernel/params.c: improve STANDARD_PARAM_DEF readability
        kernel/params.c: fix an overflow in param_attr_show
        kernel/params.c: fix the maximum length in param_get_string
        mm/memory_hotplug: define find_{smallest|biggest}_section_pfn as unsigned long
        mm/memory_hotplug: change pfn_to_section_nr/section_nr_to_pfn macro to inline function
        kernel/kcmp.c: drop branch leftover typo
        memremap: add scheduling point to devm_memremap_pages
        mm, page_alloc: add scheduling point to memmap_init_zone
        mm, memory_hotplug: add scheduling point to __add_pages
        lib/idr.c: fix comment for idr_replace()
        mm: memcontrol: use vmalloc fallback for large kmem memcg arrays
        kernel/sysctl.c: remove duplicate UINT_MAX check on do_proc_douintvec_conv()
        include/linux/bitfield.h: remove 32bit from FIELD_GET comment block
        lib/lz4: make arrays static const, reduces object code size
        exec: binfmt_misc: kill the onstack iname[BINPRM_BUF_SIZE] array
        exec: binfmt_misc: fix race between load_misc_binary() and kill_node()
        ...
      b7e14164
    • L
      Merge branch 'fixes-v4.14-rc4' of... · 6c795b30
      Linus Torvalds 提交于
      Merge branch 'fixes-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
      
      Pull smack fix from James Morris:
       "It fixes a bug in xattr_getsecurity() where security_release_secctx()
        was being called instead of kfree(), which leads to a memory leak in
        the capabilities code. smack_inode_getsecurity is also fixed to behave
        correctly when called from there"
      
      * 'fixes-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        lsm: fix smack_inode_removexattr and xattr_getsecurity memleak
      6c795b30
  2. 04 10月, 2017 34 次提交