1. 07 1月, 2016 3 次提交
  2. 06 1月, 2016 5 次提交
  3. 04 1月, 2016 22 次提交
  4. 28 12月, 2015 4 次提交
    • L
      Linux 4.4-rc7 · 74bf8efb
      Linus Torvalds 提交于
      74bf8efb
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 3ae86f1a
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
      
       - Fix bitrot in __get_user_unaligned()
       - EVA userspace accessor bug fixes.
       - Fix for build issues with certain toolchains.
       - Fix build error for VDSO with particular toolchain versions.
       - Fix build error due to a variable that should have been removed by an
         earlier patch
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: Fix bitrot in __get_user_unaligned()
        MIPS: Fix build error due to unused variables.
        MIPS: VDSO: Fix build error
        MIPS: CPS: drop .set mips64r2 directives
        MIPS: uaccess: Take EVA into account in [__]clear_user
        MIPS: uaccess: Take EVA into account in __copy_from_user()
        MIPS: uaccess: Fix strlen_user with EVA
      3ae86f1a
    • L
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · db066501
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "A smallish set of fixes that we've been sitting on for a while now,
        flushing the queue here so they go in.  Summary:
      
        A handful of fixes for OMAP, i.MX, Allwinner and Tegra:
      
         - A clock rate and a PHY setup fix for i.MX6Q/DL
         - A couple of fixes for the reduced serial bus (sunxi-rsb) on
           Allwinner
         - UART wakeirq fix for an OMAP4 board, timer config fixes for AM43XX.
         - Suspend fix for Tegra124 Chromebooks
         - Fix for missing implicit include that's different between
           ARM/ARM64"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: tegra: Fix suspend hang on Tegra124 Chromebooks
        bus: sunxi-rsb: Fix peripheral IC mapping runtime address
        bus: sunxi-rsb: Fix primary PMIC mapping hardware address
        ARM: dts: Fix UART wakeirq for omap4 duovero parlor
        ARM: OMAP2+: AM43xx: select ARM TWD timer
        ARM: OMAP2+: am43xx: enable GENERIC_CLOCKEVENTS_BROADCAST
        fsl-ifc: add missing include on ARM64
        ARM: dts: imx6: Fix Ethernet PHY mode on Ventana boards
        ARM: dts: imx: Fix the assigned-clock mismatch issue on imx6q/dl
        bus: sunxi-rsb: unlock on error in sunxi_rsb_read()
        ARM: dts: sunxi: sun6i-a31s-primo81.dts: add touchscreen axis swapping property
      db066501
    • A
      MIPS: Fix bitrot in __get_user_unaligned() · 930c0f70
      Al Viro 提交于
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      930c0f70
  5. 27 12月, 2015 6 次提交
    • L
      Merge tag 'pm+acpi-4.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 2c96961f
      Linus Torvalds 提交于
      Pull power management and ACPI fixes from Rafael Wysocki:
       "These fix an ACPI processor driver regression introduced during the
        4.3 cycle and a mistake in the recently added SCPI support in the
        arm_big_little cpufreq driver.
      
        Specifics:
      
         - Fix a thermal management issue introduced by an ACPI processor
           driver change made during the 4.3 development cycle that failed to
           return 0 from a function on success which triggered an error
           cleanup path every time it had been called that deleted useful data
           structures created previously (Srinivas Pandruvada).
      
         - Fix a variable data type issue in the arm_big_little cpufreq
           driver's SCPI support code added recently that prevents error
           handling in there from working correctly (Dan Carpenter)"
      
      * tag 'pm+acpi-4.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: scpi-cpufreq: signedness bug in scpi_get_dvfs_info()
        ACPI / processor: Fix thermal cooling device regression
      2c96961f
    • L
      Merge tag 'md/4.4-rc6-fix' of git://neil.brown.name/md · f0cf008f
      Linus Torvalds 提交于
      Pull md bugfix from Neil Brown:
       "One more md fix for 4.4-rc
      
        Fix a regression which causes reshape to not start properly sometimes"
      
      * tag 'md/4.4-rc6-fix' of git://neil.brown.name/md:
        md: remove check for MD_RECOVERY_NEEDED in action_store.
      f0cf008f
    • L
      Merge tag 'upstream-4.4-rc7' of git://git.infradead.org/linux-ubifs · 3bef22ee
      Linus Torvalds 提交于
      Pull UBI bug fixes from Richard Weinberger:
       "This contains four bug fixes for UBI"
      
      * tag 'upstream-4.4-rc7' of git://git.infradead.org/linux-ubifs:
        mtd: ubi: don't leak e if schedule_erase() fails
        mtd: ubi: fixup error correction in do_sync_erase()
        UBI: fix use of "VID" vs. "EC" in header self-check
        UBI: fix return error code
      3bef22ee
    • L
      Merge tag 'trace-v4.4-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · e2b0a161
      Linus Torvalds 提交于
      Pull ftrace/recordmcount fix from Steven Rostedt:
       "Russell King was reporting lots of warnings when he compiled his
        kernel with ftrace enabled.  With some investigation it was discovered
        that it was his compile setup.  He was using ccache with hard links,
        which allowed recordmcount to process the same .o twice.  When this
        happens, recordmcount will detect that it was already done and give a
        warning about it.
      
        Russell fixed this by having recordmcount detect that the object file
        has more than one hard link, and if it does, it unlinks the object
        file after it maps it and processes then.  This appears to fix the
        issue.
      
        As you did not like the fact that recordmcount modified the file in
        place and thought that it should do the modifications in memory and
        then write it out to disk and move it over the old file to prevent
        other more subtle issues like the one above, a second patch is added
        on top of Russell's to do just that.  Luckily the original code had
        write and lseek wrappers that I was able to modify to not do inplace
        writes, but simply keep track of the changes made in memory.  When a
        write is made, a "update" flag is set, and at the end of processing,
        if the update is set, then it writes the file with changes out to a
        new file, and then renames it over the original one.
      
        The file descriptor is still passed to the write and lseek wrappers
        because removing that would cause the change to be more intrusive.
        That can be removed in a follow up cleanup patch that can wait till
        the next merge window"
      
      * tag 'trace-v4.4-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftrace/scripts: Have recordmcount copy the object file
        scripts: recordmcount: break hardlinks
      e2b0a161
    • L
      Merge tag 'arc-4.4-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · 12261f4e
      Linus Torvalds 提交于
      Pull ARC fixes from Vineet Gupta:
       "Sorry for this late pull request, but these are all important fixes
        for code introduced/updated in this release which we will otherwise
        end up back porting.
      
         - Unwinder rework (A revert followed by better fix)
         - Build errors: MMUv2, modules with -Os
         - highmem section mismatch build splat"
      
      * tag 'arc-4.4-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: dw2 unwind: Catch Dwarf SNAFUs early
        ARC: dw2 unwind: Don't bail for CIE.version != 1
        Revert "ARC: dw2 unwind: Ignore CIE version !=1 gracefully instead of bailing"
        ARC: Fix linking errors with CONFIG_MODULE + CONFIG_CC_OPTIMIZE_FOR_SIZE
        ARC: mm: fix building for MMU v2
        ARC: mm: HIGHMEM: Fix section mismatch splat
      12261f4e
    • R
      Merge branches 'acpi-processor' and 'pm-cpufreq' · 43b28ca8
      Rafael J. Wysocki 提交于
      * acpi-processor:
        ACPI / processor: Fix thermal cooling device regression
      
      * pm-cpufreq:
        cpufreq: scpi-cpufreq: signedness bug in scpi_get_dvfs_info()
      43b28ca8