1. 21 Aug, 2015 4 commits
    • Olof Johansson's avatar
      Merge tag 'samsung-late-cpufreq-driver' of... · deb14362
      Olof Johansson authored
      Merge tag 'samsung-late-cpufreq-driver' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/late
      
      Samsung cpufreq driver updates for v4.3
      
      - remove exynos4 SoCs and exynos5250 specific cpufreq driver support
        and unselectable rule for arm-exynos-cpufreq.o because of supporting
        generic cpufreq driver for the exynos SoCs
      
      * Note this is depending on tags/samsung-clk-driver, tags/samsung-soc
        and tags/samsung-late-dt
      
      * tag 'samsung-late-cpufreq-driver' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        cpufreq: exynos: Remove unselectable rule for arm-exynos-cpufreq.o
        cpufreq: exynos: remove Exynos4x12 specific cpufreq driver support
        cpufreq: exynos: remove exynos5250 specific cpufreq driver support
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      deb14362
    • Olof Johansson's avatar
      Merge tag 'samsung-soc' of... · 418012fb
      Olof Johansson authored
      Merge tag 'samsung-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/late
      
      Samsung SoC updates for v4.3
      
      - add compatible string to exynos_cpufreq_matchs to switch for
        supporting generic cpufreq driver for exynos3250, 4210, 4212
        and 5250 SoCs in mach-exynos/
      
      * tag 'samsung-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: EXYNOS: switch to using generic cpufreq driver for exynos4x12
        ARM: EXYNOS: Add exynos3250 compatible to use generic cpufreq driver
        ARM: EXYNOS: switch to using generic cpufreq driver for exynos5250
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      418012fb
    • Olof Johansson's avatar
      Merge tag 'samsung-late-dt' of... · 819167e7
      Olof Johansson authored
      Merge tag 'samsung-late-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/late
      
      Samsung 2nd DT updates for v4.3
      
      - for exynos3250, 4212, 4412 and 5250
        : add CPU OPP and regulator supply property
      
      - for exynos3250
        : add CPU cooling binding for exynos3250 boards
      
      - for exynos4 SoCs
        : add iommu property to JPEG device
      
      - for exynos4412-odroidu3
        : enable SPI1
      
      - for exynos5250-snow
        : add SPI CS
      
      - for exynos5422
        : add exynos5422-cpus.dtsi to correct cpu order
      
      * Note this branch is depending on tags/samsung-clk-driver
      
      * tag 'samsung-late-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (22 commits)
        ARM: dts: add iommu property to JPEG device for exynos4
        ARM: dts: enable SPI1 for exynos4412-odroidu3
        ARM: dts: Add SPI CS on exynos5250-snow
        ARM: dts: Add CPU cooling binding for exynos3250 boards
        ARM: dts: add exynos5422-cpus.dtsi to correct cpu order
        ARM: dts: add CPU OPP and regulator supply property for exynos4x12
        ARM: dts: Add CPU OPP and regulator supply property for exynos3250
        ARM: dts: add CPU OPP and regulator supply property for exynos5250
        ARM: dts: Extend exynos5420-pinctrl nodes using labels instead of paths
        ARM: dts: Include exynos5420-pinctrl after the nodes were defined for exynos5420
        ARM: dts: Extend exynos5250-pinctrl nodes using labels instead of paths
        ARM: dts: Include exynos5250-pinctrl after the nodes were defined for exynos5250
        ARM: dts: Enable thermal-zones for exynos5422-odroidxu3
        ARM: dts: Define default thermal-zones for exynos5422
        ARM: dts: Enable TMU for exynos5422-odroidxu3
        ARM: dts: Add pwm-fan node for exynos5422-odroidxu3
        ARM: dts: Use labels for overriding nodes for exynos4210-universal_c210
        ARM: dts: Set max17047 over heat and voltage thresholds for exynos4412-trats2
        ARM: dts: Enable USB3 regulators for exynos5422-odroidxu3
        ARM: dts: Clean up indentation for exynos5410-smdk5410
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      819167e7
    • Olof Johansson's avatar
      Merge tag 'samsung-clk-driver' of... · 6b077058
      Olof Johansson authored
      Merge tag 'samsung-clk-driver' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/late
      
      Samsung clk driver updates for v4.3
      
      - add cpu clock configuration data and instantiate cpu clock
        for exynos3250, 4210, 4412 and 5250 SoCs to support Samsung
        specific cpu-clock type
      
      * Note this branch has been provided to clk tree as a topic branch
      
      * tag 'samsung-clk-driver' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        clk: exynos4x12: add cpu clock configuration data and instantiate cpu clock
        clk: exynos3250: Add cpu clock configuration data and instaniate cpu clock
        clk: exynos5250: add cpu clock configuration data and instantiate cpu clock
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      6b077058
  2. 13 Aug, 2015 14 commits
  3. 24 Jul, 2015 3 commits
  4. 21 Jul, 2015 14 commits
  5. 12 Jul, 2015 5 commits
    • Linus Torvalds's avatar
      Linux 4.2-rc2 · bc0195aa
      Linus Torvalds authored
      bc0195aa
    • Linus Torvalds's avatar
      Revert "drm/i915: Use crtc_state->active in primary check_plane func" · 01e2d062
      Linus Torvalds authored
      This reverts commit dec4f799.
      
      Jörg Otte reports a NULL pointder dereference due to this commit, as
      'crtc_state' very much can be NULL:
      
              crtc_state = state->base.state ?
                      intel_atomic_get_crtc_state(state->base.state, intel_crtc) : NULL;
      
      So the change to test 'crtc_state->base.active' cannot possibly be
      correct as-is.
      
      There may be some other minimal fix (like just checking crtc_state for
      NULL), but I'm just reverting it now for the rc2 release, and people
      like Daniel Vetter who actually know this code will figure out what the
      right solution is in the longer term.
      Reported-and-bisected-by: default avatarJörg Otte <jrg.otte@gmail.com>
      Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
      Cc: Jani Nikula <jani.nikula@linux.intel.com>
      Cc: Daniel Vetter <daniel.vetter@intel.com>
      CC: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      01e2d062
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · c83727a6
      Linus Torvalds authored
      Pull VFS fixes from Al Viro:
       "Fixes for this cycle regression in overlayfs and a couple of
        long-standing (== all the way back to 2.6.12, at least) bugs"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        freeing unlinked file indefinitely delayed
        fix a braino in ovl_d_select_inode()
        9p: don't leave a half-initialized inode sitting around
      c83727a6
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 7fbb58a0
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "A fair number of 4.2 fixes also because Markos opened the flood gates.
      
         - Patch up the math used calculate the location for the page bitmap.
      
         - The FDC (Not what you think, FDC stands for Fast Debug Channel) IRQ
           around was causing issues on non-Malta platforms, so move the code
           to a Malta specific location.
      
         - A spelling fix replicated through several files.
      
         - Fix to the emulation of an R2 instruction for R6 cores.
      
         - Fix the JR emulation for R6.
      
         - Further patching of mindless 64 bit issues.
      
         - Ensure the kernel won't crash on CPUs with L2 caches with >= 8
           ways.
      
         - Use compat_sys_getsockopt for O32 ABI on 64 bit kernels.
      
         - Fix cache flushing for multithreaded cores.
      
         - A build fix"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: O32: Use compat_sys_getsockopt.
        MIPS: c-r4k: Extend way_string array
        MIPS: Pistachio: Support CDMM & Fast Debug Channel
        MIPS: Malta: Make GIC FDC IRQ workaround Malta specific
        MIPS: c-r4k: Fix cache flushing for MT cores
        Revert "MIPS: Kconfig: Disable SMP/CPS for 64-bit"
        MIPS: cps-vec: Use macros for various arithmetics and memory operations
        MIPS: kernel: cps-vec: Replace KSEG0 with CKSEG0
        MIPS: kernel: cps-vec: Use ta0-ta3 pseudo-registers for 64-bit
        MIPS: kernel: cps-vec: Replace mips32r2 ISA level with mips64r2
        MIPS: kernel: cps-vec: Replace 'la' macro with PTR_LA
        MIPS: kernel: smp-cps: Fix 64-bit compatibility errors due to pointer casting
        MIPS: Fix erroneous JR emulation for MIPS R6
        MIPS: Fix branch emulation for BLTC and BGEC instructions
        MIPS: kernel: traps: Fix broken indentation
        MIPS: bootmem: Don't use memory holes for page bitmap
        MIPS: O32: Do not handle require 32 bytes from the stack to be readable.
        MIPS, CPUFREQ: Fix spelling of Institute.
        MIPS: Lemote 2F: Fix build caused by recent mass rename.
      7fbb58a0
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1daa1cfb
      Linus Torvalds authored
      Pull x86 fixes from Thomas Gleixner:
      
       - the high latency PIT detection fix, which slipped through the cracks
         for rc1
      
       - a regression fix for the early printk mechanism
      
       - the x86 part to plug irq/vector related hotplug races
      
       - move the allocation of the espfix pages on cpu hotplug to non atomic
         context.  The current code triggers a might_sleep() warning.
      
       - a series of KASAN fixes addressing boot crashes and usability
      
       - a trivial typo fix for Kconfig help text
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/kconfig: Fix typo in the CONFIG_CMDLINE_BOOL help text
        x86/irq: Retrieve irq data after locking irq_desc
        x86/irq: Use proper locking in check_irq_vectors_for_cpu_disable()
        x86/irq: Plug irq vector hotplug race
        x86/earlyprintk: Allow early_printk() to use console style parameters like '115200n8'
        x86/espfix: Init espfix on the boot CPU side
        x86/espfix: Add 'cpu' parameter to init_espfix_ap()
        x86/kasan: Move KASAN_SHADOW_OFFSET to the arch Kconfig
        x86/kasan: Add message about KASAN being initialized
        x86/kasan: Fix boot crash on AMD processors
        x86/kasan: Flush TLBs after switching CR3
        x86/kasan: Fix KASAN shadow region page tables
        x86/init: Clear 'init_level4_pgt' earlier
        x86/tsc: Let high latency PIT fail fast in quick_pit_calibrate()
      1daa1cfb