1. 09 2月, 2018 1 次提交
  2. 08 2月, 2018 13 次提交
    • J
      CRIS: Restore mistakenly cleared kernel Makefile · 6e037721
      Jesper Nilsson 提交于
      Commit 0fbc0b67 ("cris: remove arch specific early DT functions")
      was a bit overzealous in removing the CRIS DT handling,
      and the complete contents of the Makefile was erased
      instead of just the line for the devicetree file.
      
      This lead to a complete link failure for all SoCs in
      the CRIS port due to missing symbols.
      
      Restore the contents except the line for the devicetree file.
      Signed-off-by: NJesper Nilsson <jesper.nilsson@axis.com>
      Fixes: 0fbc0b67
      6e037721
    • L
      Merge tag 'modules-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux · 581e400f
      Linus Torvalds 提交于
      Pull modules updates from Jessica Yu:
       "Minor code cleanups and MAINTAINERS update"
      
      * tag 'modules-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
        modpost: Remove trailing semicolon
        ftrace/module: Move ftrace_release_mod() to ddebug_cleanup label
        MAINTAINERS: Remove from module & paravirt maintenance
      581e400f
    • L
      Merge tag 'iversion-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux · 6fbac201
      Linus Torvalds 提交于
      Pull inode->i_version cleanup from Jeff Layton:
       "Goffredo went ahead and sent a patch to rename this function, and
        reverse its sense, as we discussed last week.
      
        The patch is very straightforward and I figure it's probably best to
        go ahead and merge this to get the API as settled as possible"
      
      * tag 'iversion-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
        iversion: Rename make inode_cmp_iversion{+raw} to inode_eq_iversion{+raw}
      6fbac201
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · fe803f86
      Linus Torvalds 提交于
      Pull UDF and ext2 fixlets from Jan Kara:
       "A UDF fix and an ext2 cleanup"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        ext2: drop unneeded newline
        udf: Sanitize nanoseconds for time stamps
      fe803f86
    • L
      Merge tag 'regulator-fix-v4.16-suspend' of... · ffefb181
      Linus Torvalds 提交于
      Merge tag 'regulator-fix-v4.16-suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
      
      Pull regulator fix from Mark Brown:
       "Fix suspend to idle.
      
        Testing on mainline after the initial regulator pull request went in
        identified a regression for suspend to idle due to it calling the
        suspend operations with states that it wasn't realized could happen,
        this patch fixes the problem"
      
      * tag 'regulator-fix-v4.16-suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: Fix suspend to idle
      ffefb181
    • L
      Merge tag 'fbdev-v4.16' of git://github.com/bzolnier/linux · c3611b6d
      Linus Torvalds 提交于
      Pull fbdev updates from Bartlomiej Zolnierkiewicz:
       "There is nothing really major here:
      
         - fix display-timings lookup in the Device Tree in atmel_lcdfb driver
           (Johan Hovold)
      
         - fix video mode and line_length to be set correctly in vfb driver
           (Pieter "PoroCYon" Sluys)
      
         - fix returning nonsensical values to the user-space on GIO_FONTX
           ioctl when using dummy console (Nicolas Pitre)
      
         - add missing license tag to mmpfb driver (Arnd Bergmann)
      
         - convert radeonfb and pxa3xx_gcu drivers to use ktime_get[_ts64]()
           instead of the deprecated do_gettimeofday() (Arnd Bergmann)
      
         - switch udlfb driver from using the pr_*() logging functions to the
           dev_*() ones + related cleanups (Ladislav Michl)
      
         - use __raw I/O accessors also on arm64 (Ji Zhang)
      
         - fix Kconfig help text for intelfb driver (Randy Dunlap)
      
         - do not duplicate features data in omapfb driver (Ladislav Michl)
      
         - misc cleanups (Colin Ian King, Markus Elfring, Rasmus Villemoes,
           Vasyl Gomonovych, Himanshu Jha, Michael Trimarchi)"
      
      * tag 'fbdev-v4.16' of git://github.com/bzolnier/linux: (25 commits)
        video: udlfb: Switch from the pr_*() to the dev_*() logging functions
        video: udlfb: Constify read only data
        video: fbdev/mmp: add MODULE_LICENSE
        console/dummy: leave .con_font_get set to NULL
        fbdev: mxsfb: use framebuffer_alloc in the correct way
        video: udlfb: Do not name private data 'dev'
        video: udlfb: Remove noisy warnings
        video: udlfb: Remove redundant gdev variable
        video: udlfb: Remove unnecessary local variable
        fbdev: auo_k190x: Use zeroing memory allocator instead of allocator/memset
        vfb: fix video mode and line_length being set when loaded
        fbdev: arm64 use __raw I/O memory api
        omapfb: dss: Do not duplicate features data
        video: fbdev: omap2: Use PTR_ERR_OR_ZERO()
        fbdev: au1200fb: delete duplicate header contents
        fbdev: pxa3xx: use ktime_get_ts64 for time stamps
        fbdev: radeon: use ktime_get() for HZ calibration
        video: smscufx: Improve a size determination in two functions
        video: udlfb: Delete an unnecessary return statement in two functions
        video: udlfb: Improve a size determination in dlfb_alloc_urb_list()
        ...
      c3611b6d
    • L
      Merge tag 'platform-drivers-x86-v4.16-2' of git://git.infradead.org/linux-platform-drivers-x86 · cc006a22
      Linus Torvalds 提交于
      Pull more x86 platform-drivers updates from Andy Shevchenko:
       "The DEFINE_SHOW_ATTRIBUTE() macro was defined privately in three
        locations and is useful for new and old users to avoid a lot of code
        duplication.
      
        Move the macro to seq_file.h.
      
        Along with above, clean up three drivers to use that macro.
      
        This, due to dependencies, was sent separately since affected changes
        weren't upstream originally yet. The rationale of doing this now is to
        allow use of new macro in v4.17 cycle in a conflictless manner"
      
      * tag 'platform-drivers-x86-v4.16-2' of git://git.infradead.org/linux-platform-drivers-x86:
        platform/x86: samsung-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro
        platform/x86: ideapad-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro
        platform/x86: dell-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro
        seq_file: Introduce DEFINE_SHOW_ATTRIBUTE() helper macro
      cc006a22
    • L
      Merge tag 'asoc-v4.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound · 7590e37b
      Linus Torvalds 提交于
      Pull more ASoC updates from Mark Brown:
       "With the merge window having been delayed for another week here's
        another batch of updates that came in during that week.
      
        There's a few important fixes in here, mainly a fix for I/O on a
        number of devices caused by some of the component rework and a fix for
        a potential issue if more than one component in a link provides
        compressed operations. The I/O fixes are particularly important as the
        problem causes a power regression on a number of OMAP platforms"
      
      * tag 'asoc-v4.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound: (22 commits)
        ASoC: stm32: add of dependency for stm32 drivers
        ASoC: mt8173-rt5650: fix child-node lookup
        ASoC: dapm: fix debugfs read using path->connected
        ASoC: compress: Fixup error messages
        ASoC: compress: Remove some extraneous blank lines
        ASoC: compress: Correct handling of copy callback
        ASoC: Intel: kbl: Enable mclk and ssp sclk early
        ASoC: Intel: Skylake: Add extended I2S config blob support in Clock driver
        ASoC: Intel: Skylake: Add ssp clock driver
        ASoC: Fix twl4030 and 6040 regression by adding back read and write
        ASoC: sun8i-codec: Add ADC support for a33
        ASoC: rockchip: Use dummy_dai for rt5514 dsp dailink
        ASoC: soc-pcm: rename .pmdown_time to .use_pmdown_time for Component
        ASoC: ak4613: call dummy write for PW_MGMT1/3 when Playback
        ASoC: soc-pcm: don't call flush_delayed_work() many times in soc_pcm_private_free()
        ASoC: soc-core: snd_soc_rtdcom_lookup() cares component driver name
        ASoC: sam9x5_wm8731: Drop 'ASoC' prefix from error messages
        ASoC: sam9g20_wm8731: use dev_*() logging functions
        ASoC: max98373 Changed SPDX header in C++ comments style
        ASoC: dmic: Fix check of return value from read of 'num-channels'
        ...
      7590e37b
    • L
      Merge tag 'linux-watchdog-4.16-rc1' of git://www.linux-watchdog.org/linux-watchdog · 7e6127c1
      Linus Torvalds 提交于
      Pull watchdog updates from Wim Van Sebroeck:
      
       - new watchdog device drivers for Realtek RTD1295 and Spreadtrum SC9860
         platform
      
       - add support for the following devices: jz4780 SoC, AST25xx series SoC
         and r8a77970 SoC
      
       - convert to watchdog framework: i6300esb_wdt, xen_wdt and sp5100_tco
      
       - several fixes for watchdog core
      
       - remove at32ap700x and obsolete documentation
      
       - gpio: Convert to use GPIO descriptors
      
       - rename gemini into FTWDT010 as this IP block is generc from Faraday
         Technology
      
       - various clean-ups and small bugfixes
      
       - add Guenter Roeck as co-maintainer
      
       - change maintainers e-mail address
      
      * tag 'linux-watchdog-4.16-rc1' of git://www.linux-watchdog.org/linux-watchdog: (74 commits)
        documentation: watchdog: remove documentation of w83697hf_wdt/w83697ug_wdt
        documentation: watchdog: remove documentation for ixp2000
        documentation: watchdog: remove documentation of at32ap700x_wdt
        watchdog: remove at32ap700x_wdt
        watchdog: sp5100_tco: Add support for recent FCH versions
        watchdog: sp5100-tco: Abort if watchdog is disabled by hardware
        watchdog: sp5100_tco: Use bit operations
        watchdog: sp5100_tco: Convert to use watchdog subsystem
        watchdog: sp5100_tco: Clean up function and variable names
        watchdog: sp5100_tco: Use dev_ print functions where possible
        watchdog: sp5100_tco: Match PCI device early
        watchdog: sp5100_tco: Clean up sp5100_tco_setupdevice
        watchdog: sp5100_tco: Use standard error codes
        watchdog: sp5100_tco: Use request_muxed_region where possible
        watchdog: sp5100_tco: Fix watchdog disable bit
        watchdog: sp5100_tco: Always use SP5100_IO_PM_{INDEX_REG,DATA_REG}
        watchdog: core: make sure the watchdog_worker is not deferred
        watchdog: mt7621: switch to using managed devm_watchdog_register_device()
        watchdog: mt7621: set WDOG_HW_RUNNING bit when appropriate
        watchdog: imx2_wdt: restore previous timeout after suspend+resume
        ...
      7e6127c1
    • L
      Merge tag 'riscv-for-linus-4.16-merge_window' of... · 413879a1
      Linus Torvalds 提交于
      Merge tag 'riscv-for-linus-4.16-merge_window' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux
      
      Pull RISC-V updates from Palmer Dabbelt:
       "This contains the fixes we'd like to target for the 4.16 merge window.
        It's not as much as I was originally hoping to do but between glibc,
        the chip, and FOSDEM there just wasn't enough time to get everything
        put together. As such, this merge window is essentially just going to
        be small changes. This includes mostly cleanups:
      
         - A build fix failure to the audit test cases.
      
           RISC-V doesn't have renameat because the generic syscall ABI moved
           to renameat2 by the time of our port. The syscall audit test cases
           don't understand this, so I added a trivial fix. This went through
           mailing list review during the 4.15 merge window, but nobody has
           picked it up so I think it's best to just do this here.
      
         - The removal of our command-line argument processing code. The
           "mem_end" stuff was broken and the rest duplicated generic device
           tree code. The generic code was already being called.
      
         - Some unused/redundant code has been removed, including
           __ARCH_HAVE_MMU, current_pgdir, and the initialization of
           init_mm.pgd.
      
         - SUM is disabled upon taking a trap, which means that user memory is
           protected during traps taking inside copy_{to,from}_user().
      
         - The sptbr CSR has been renamed to satp in C code. We haven't
           changed the assembly code in order to maintain compatibility with
           binutils 2.29, which doesn't understand the new name.
      
        Additionally, we're adding some new features:
      
         - Basic ftrace support, thanks to Alan Kao!
      
         - Support for ZONE_DMA32.
      
           This is necessary for all the normal reasons, but also to deal with
           a deficiency in the Xilinx PCIe controller we're using on our
           FPGA-based systems. While the ZONE_DMA32 addition should be
           sufficient for most uses, it doesn't complete the fix for the
           Xilinx controller.
      
         - TLB shootdowns now only target the harts where they're necessary,
           instead of applying to all harts in the system.
      
        These patches have all been sitting on our linux-next branch for a
        while now. Due to time constraints this is all I feel comfortable
        submitting during the 4.16 merge window, hopefully we'll do better
        next time!"
      
      [ Note to self: "harts" is RISC-V speak for "hardware threads".  I had
        to look that up.    - Linus ]
      
      * tag 'riscv-for-linus-4.16-merge_window' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
        riscv: inline set_pgdir into its only caller
        riscv: rename sptbr to satp
        riscv: don't read back satp in paging_init
        riscv: remove the unused current_pgdir function
        riscv: add ZONE_DMA32
        RISC-V: Limit the scope of TLB shootdowns
        riscv: disable SUM in the exception handler
        riscv: remove redundant unlikely()
        riscv: remove unused __ARCH_HAVE_MMU define
        riscv/ftrace: Add basic support
        RISC-V: Remove mem_end command line processing
        RISC-V: Remove duplicate command-line parsing logic
        audit: Avoid build failures on systems without renameat
      413879a1
    • L
      Merge tag 'mips_fixes_4.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips · 0bd2afc7
      Linus Torvalds 提交于
      Pull MIPS fixes from James Hogan:
       "A couple of MIPS fixes for 4.16-rc1, including an important regression
        in 4.15 and a rather more longstanding corner case build fix.
      
        These are separate from the main pull request as one of the bugs fixed
        was only recently introduced in v4.15-rc8.
      
         - Fix CPS regression on older binutils due to MIPS_ISA_LEVEL_RAW fix
           (4.15)
      
         - Fix allmodconfig + CONFIG_MACH_TX49XX=y builds due to incorrect use
           of IS_ENABLED() (2.6.28)"
      
      * tag 'mips_fixes_4.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
        MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS
        MIPS: CPS: Fix MIPS_ISA_LEVEL_RAW fallout
      0bd2afc7
    • L
      Merge tag 'mips_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips · 85789536
      Linus Torvalds 提交于
      Pull MIPS updates from James Hogan:
       "These are the main MIPS changes for 4.16.
      
        Rough overview:
      
         (1) Basic support for the Ingenic JZ4770 based GCW Zero open-source
             handheld video game console
      
         (2) Support for the Ranchu board (used by Android emulator)
      
         (3) Various cleanups and misc improvements
      
        More detailed summary:
      
        Fixes:
         - Fix generic platform's USB_*HCI_BIG_ENDIAN selects (4.9)
         - Fix vmlinuz default build when ZBOOT selected
         - Fix clean up of vmlinuz targets
         - Fix command line duplication (in preparation for Ingenic JZ4770)
      
        Miscellaneous:
         - Allow Processor ID reads to be to be optimised away by the compiler
           (improves performance when running in guest)
         - Push ARCH_MIGHT_HAVE_PC_SERIO/PARPORT down to platform level to
           disable on generic platform with Ranchu board support
         - Add helpers for assembler macro instructions for older assemblers
         - Use assembler macro instructions to support VZ, XPA & MSA
           operations on older assemblers, removing C wrapper duplication
         - Various improvements to VZ & XPA assembly wrappers
         - Add drivers/platform/mips/ to MIPS MAINTAINERS entry
      
        Minor cleanups:
         - Misc FPU emulation cleanups (removal of unnecessary include, moving
           macros to common header, checkpatch and sparse fixes)
         - Remove duplicate assignment of core in play_dead()
         - Remove duplication in watchpoint handling
         - Remove mips_dma_mapping_error() stub
         - Use NULL instead of 0 in prepare_ftrace_return()
         - Use proper kernel-doc Return keyword for
           __compute_return_epc_for_insn()
         - Remove duplicate semicolon in csum_fold()
      
        Platform support:
      
        Broadcom:
         - Enable ZBOOT on BCM47xx
      
        Generic platform:
         - Add Ranchu board support, used by Android emulator
         - Fix machine compatible string matching for Ranchu
         - Support GIC in EIC mode
      
        Ingenic platforms:
         - Add DT, defconfig and other support for JZ4770 SoC and GCW Zero
         - Support dynamnic machine types (i.e. JZ4740 / JZ4770 / JZ4780)
         - Add Ingenic JZ4770 CGU clocks
         - General Ingenic clk changes to prepare for JZ4770 SoC support
         - Use common command line handling code
         - Add DT vendor prefix to GCW (Game Consoles Worldwide)
      
        Loongson:
         - Add MAINTAINERS entry for Loongson2 and Loongson3 platforms
         - Drop 32-bit support for Loongson 2E/2F devices
         - Fix build failures due to multiple use of 'MEM_RESERVED'"
      
      * tag 'mips_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips: (53 commits)
        MIPS: Malta: Sanitize mouse and keyboard configuration.
        MIPS: Update defconfigs after previous patch.
        MIPS: Push ARCH_MIGHT_HAVE_PC_SERIO down to platform level
        MIPS: Push ARCH_MIGHT_HAVE_PC_PARPORT down to platform level
        MIPS: SMP-CPS: Remove duplicate assignment of core in play_dead
        MIPS: Generic: Support GIC in EIC mode
        MIPS: generic: Fix Makefile alignment
        MIPS: generic: Fix ranchu_of_match[] termination
        MIPS: generic: Fix machine compatible matching
        MIPS: Loongson fix name confict - MEM_RESERVED
        MIPS: bcm47xx: enable ZBOOT support
        MIPS: Fix trailing semicolon
        MIPS: Watch: Avoid duplication of bits in mips_read_watch_registers
        MIPS: Watch: Avoid duplication of bits in mips_install_watch_registers.
        MIPS: MSA: Update helpers to use new asm macros
        MIPS: XPA: Standardise readx/writex accessors
        MIPS: XPA: Allow use of $0 (zero) to MTHC0
        MIPS: XPA: Use XPA instructions in assembly
        MIPS: VZ: Pass GC0 register names in $n format
        MIPS: VZ: Update helpers to use new asm macros
        ...
      85789536
    • L
      Merge tag 'docs-4.16-2' of git://git.lwn.net/linux · e03ab6c4
      Linus Torvalds 提交于
      Pull more documentation updates from Jonathan Corbet:
       "A few late-arriving fixes, along with Konstantin's PGP document that
        had no reason to wait another cycle"
      
      * tag 'docs-4.16-2' of git://git.lwn.net/linux:
        Documentation/process: tweak pgp maintainer guide
        Documentation/admin-guide: fixes for thunderbolt.rst
        Documentation: mips: Update AU1xxx_IDE Kconfig dependencies
        Fix broken link in Documentation/process/kernel-docs.rst
        Documentation/process: kernel maintainer PGP guide
      e03ab6c4
  3. 07 2月, 2018 26 次提交