1. 22 Jul, 2015 1 commit
    • Olof Johansson's avatar
      Merge tag 'omap-for-v4.3/legacy-v2-signed' of... · 9521f492
      Olof Johansson authored
      Merge tag 'omap-for-v4.3/legacy-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
      
      Merge "drop few more legacy boards for v4.3" from Tony Lindgren:
      
      Drop more omap3 legacy board-*.c files for v4.3. This time we're
      dropping the board files for omap3logic and omap3pandora.
      
      The reason for dropping these now rather than later is that now
      we can simply revert the patches in case of unexpected issues as
      we are not dropping any platform data at this point.
      
      This leaves us with only the following board-*.c files:
      
      BOARD                   REASON NEEDED
      board-ldp.c             Still used in RMKs boot test system
      board-rx51-*.c          Needs /proc/atags support for user space
      
      Once we have the n900 legacy user space issues sorted out for
      /proc/atags and system_rev, we can drop the remaining two
      board-*.c files. And then one merge window after that we can
      drop the legacy booting support assuming no unexpected issues
      are found.
      
      * tag 'omap-for-v4.3/legacy-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: Remove legacy booting support for Pandora
        ARM: OMAP2+: Remove legacy booting support for LogicPD Torpedo
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      9521f492
  2. 17 Jul, 2015 28 commits
  3. 16 Jul, 2015 1 commit
    • Tony Lindgren's avatar
      ARM: OMAP2+: Remove legacy booting support for Pandora · 7fcf7e06
      Tony Lindgren authored
      We've been moving all omap2+ based systems to boot in device tree only
      mode for a few years now. Only omap3 has legacy booting support
      remaining. Most omap3 boards already have related arch/arm/boot/*.dts*
      files for booting with device tree.
      
      This board has support for device tree based booting, and we've been
      printing warnings about the legacy booting being deprecated for a
      few merge cycles now. Let's attempt to remove the legacy booting
      for it.
      
      The reason for removing the legacy booting support now rather than
      later is we can simply revert this patch if necessary if we run
      into some unexpected issues that are not trivial to fix for the
      device tree based booting.
      
      Cc: Grazvydas Ignotas <notasas@gmail.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      7fcf7e06
  4. 14 Jul, 2015 2 commits
    • Olof Johansson's avatar
      Merge tag 'renesas-pm-domain-for-v4.3' of... · b3f81739
      Olof Johansson authored
      Merge tag 'renesas-pm-domain-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
      
      Merge "Renesas ARM Based SoC PM Domain Updates for v4.3" from Simon Horman:
      
      * Make rcar_sysc_ch const for r8a779[09] SoCs
      * Get rid of on_off_fn() function pointer
      * Use BIT() macro instead of open coding
      * Make struct rcar_sysc_ch * parameters const
      * Break infinite loop
      * Shrink rcar_sysc_ch size
      * Improve documentation
      
      * tag 'renesas-pm-domain-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: r8a7790: Make struct rcar_sysc_ch const
        ARM: shmobile: r8a7779: Make struct rcar_sysc_ch const
        ARM: shmobile: R-Car: Get rid of on_off_fn() function pointer
        ARM: shmobile: R-Car: Use BIT() macro instead of open coding
        ARM: shmobile: R-Car: Make struct rcar_sysc_ch * parameters const
        ARM: shmobile: R-Car: Break infinite loop
        ARM: shmobile: R-Car: Shrink rcar_sysc_ch size
        ARM: shmobile: R-Car: Improve documentation
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      b3f81739
    • Olof Johansson's avatar
      Merge tag 'renesas-cleanup-for-v4.3' of... · 63f34693
      Olof Johansson authored
      Merge tag 'renesas-cleanup-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
      
      Merge "Renesas ARM Based SoC Cleanup for v4.3" from Simon Horman:
      
      * Remove non-multiplatform code from timer
      * Remove CONFIG_ARCH_SHMOBILE_MULTI check in setup-rcar-gen2.c
        as it is always true
      * Remove legacy (non-multiplatform) support for both sh73a0/kzm9g and
        r8a7740/armadillo800eva
      * Move to_rmobile_pd from header to source file where it is used
      * Use BIT() macro instead of open coding in r-mobile PM code
      * r8a7779: Remove usage of GENPD_FLAG_PM_CLK flag which has no effect
      
      * tag 'renesas-cleanup-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: timer: r8a73a4 and r8a7790 are multi-platform only
        ARM: shmobile: R-Car Gen2: CONFIG_ARCH_SHMOBILE_MULTI is always set
        ARM: shmobile: Remove obsolete zboot support
        ARM: shmobile: R-Mobile: Remove legacy PM Domain code
        ARM: shmobile: Remove unused dma-register.h
        ARM: shmobile: Remove legacy SoC code for R-Mobile A1
        ARM: shmobile: Drop r8a7740-armadillo800eva.dtb for legacy builds
        ARM: shmobile: Remove legacy armadillo800eva_defconfig
        ARM: shmobile: Remove legacy board code for Armadillo-800 EVA
        ARM: shmobile: Remove legacy SoC code for SH-Mobile AG5
        ARM: shmobile: Drop sh73a0-kzm9g.dtb for legacy builds
        ARM: shmobile: Remove legacy kzm9g_defconfig
        ARM: shmobile: Remove legacy board code for KZM-A9-GT
        ARM: shmobile: r8a7779: Remove GENPD_FLAG_PM_CLK flag
        ARM: shmobile: R-Mobile: Use BIT() macro instead of open coding
        ARM: shmobile: R-Mobile: Move to_rmobile_pd from header to source file
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      63f34693
  5. 13 Jul, 2015 1 commit
    • Tony Lindgren's avatar
      ARM: OMAP2+: Remove legacy booting support for LogicPD Torpedo · d0796c4c
      Tony Lindgren authored
      We've been moving all omap2+ based systems to boot in device tree only
      mode for a few years now. Only omap3 has legacy booting support
      remaining. Most omap3 boards already have related arch/arm/boot/*.dts*
      files for booting with device tree.
      
      This board has support for device tree based booting, and we've been
      printing warnings about the legacy booting being deprecated for a
      few merge cycles now. Let's attempt to remove the legacy booting
      for it.
      
      The reason for removing the legacy booting support now rather than
      later is we can simply revert this patch if necessary if we run
      into some unexpected issues that are not trivial to fix for the
      device tree based booting.
      
      Cc: Tim Nordell <tim.nordell@logicpd.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      d0796c4c
  6. 12 Jul, 2015 7 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
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7b732169
      Linus Torvalds authored
      Pull timer fixes from Thomas Gleixner:
       "This update from the timer departement contains:
      
         - A series of patches which address a shortcoming in the tick
           broadcast code.
      
           If the broadcast device is not available or an hrtimer emulated
           broadcast device, some of the original assumptions lead to boot
           failures.  I rather plugged all of the corner cases instead of only
           addressing the issue reported, so the change got a little larger.
      
           Has been extensivly tested on x86 and arm.
      
         - Get rid of the last holdouts using do_posix_clock_monotonic_gettime()
      
         - A regression fix for the imx clocksource driver
      
         - An update to the new state callbacks mechanism for clockevents.
           This is required to simplify the conversion, which will take place
           in 4.3"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        tick/broadcast: Prevent NULL pointer dereference
        time: Get rid of do_posix_clock_monotonic_gettime
        cris: Replace do_posix_clock_monotonic_gettime()
        tick/broadcast: Unbreak CONFIG_GENERIC_CLOCKEVENTS=n build
        tick/broadcast: Handle spurious interrupts gracefully
        tick/broadcast: Check for hrtimer broadcast active early
        tick/broadcast: Return busy when IPI is pending
        tick/broadcast: Return busy if periodic mode and hrtimer broadcast
        tick/broadcast: Move the check for periodic mode inside state handling
        tick/broadcast: Prevent deep idle if no broadcast device available
        tick/broadcast: Make idle check independent from mode and config
        tick/broadcast: Sanity check the shutdown of the local clock_event
        tick/broadcast: Prevent hrtimer recursion
        clockevents: Allow set-state callbacks to be optional
        clocksource/imx: Define clocksource for mx27
      7b732169
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c4bc680c
      Linus Torvalds authored
      Pull irq fix from Thomas Gleixner:
       "A single fix for a cpu hotplug race vs. interrupt descriptors:
      
        Prevent irq setup/teardown across the cpu starting/dying parts of cpu
        hotplug so that the starting/dying cpu has a stable view of the
        descriptor space.  This has been an issue for all architectures in the
        cpu dying phase, where interrupts are migrated away from the dying
        cpu.  In the starting phase its mostly a x86 issue vs the vector space
        update"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        hotplug: Prevent alloc/free of irq descriptors during cpu up/down
      c4bc680c