Skip to content
  1. Sep 18, 2015
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 42dc2a30
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       - misc fixes all around the map
       - block non-root vm86(old) if mmap_min_addr != 0
       - two small debuggability improvements
       - removal of obsolete paravirt op
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/platform: Fix Geode LX timekeeping in the generic x86 build
        x86/apic: Serialize LVTT and TSC_DEADLINE writes
        x86/ioapic: Force affinity setting in setup_ioapic_dest()
        x86/paravirt: Remove the unused pv_time_ops::get_tsc_khz method
        x86/ldt: Fix small LDT allocation for Xen
        x86/vm86: Fix the misleading CONFIG_VM86 Kconfig help text
        x86/cpu: Print family/model/stepping in hex
        x86/vm86: Block non-root vm86(old) if mmap_min_addr != 0
        x86/alternatives: Make optimize_nops() interrupt safe and synced
        x86/mm/srat: Print non-volatile flag in SRAT
        x86/cpufeatures: Enable cpuid for Intel SHA extensions
      42dc2a30
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1345df21
      Linus Torvalds authored
      Pull timer fixes from Ingo Molnar:
       "A fix for an abs()/abs64() bug that caused too slow NTP convergence on
        32-bit kernels, plus a removal of an obsolete clockevents driver
        facility after all users got converted during the merge window"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        clockevents: Remove unused set_mode() callback
        time: Fix timekeeping_freqadjust()'s incorrect use of abs() instead of abs64()
      1345df21
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c2ea72fd
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "A migrate_tasks() locking fix, and a late-coming nohz change plus a
        nohz debug check"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched: 'Annotate' migrate_tasks()
        nohz: Assert existing housekeepers when nohz full enabled
        nohz: Affine unpinned timers to housekeepers
      c2ea72fd
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a706797f
      Linus Torvalds authored
      Pull perf fixes from Ingo MOlnar:
       "Mostly tooling fixes, but also two x86 PMU driver fixes"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf tests: Fix software clock events test setting maps
        perf tests: Fix task exit test setting maps
        perf evlist: Fix create_syswide_maps() not propagating maps
        perf evlist: Fix add() not propagating maps
        perf evlist: Factor out a function to propagate maps for a single evsel
        perf evlist: Make create_maps() use set_maps()
        perf evlist: Make set_maps() more resilient
        perf evsel: Add own_cpus member
        perf evlist: Fix missing thread_map__put in propagate_maps()
        perf evlist: Fix splice_list_tail() not setting evlist
        perf evlist: Add has_user_cpus member
        perf evlist: Remove redundant validation from propagate_maps()
        perf evlist: Simplify set_maps() logic
        perf evlist: Simplify propagate_maps() logic
        perf top: Fix segfault pressing -> with no hist entries
        perf header: Fixup reading of HEADER_NRCPUS feature
        perf/x86/intel: Fix constraint access
        perf/x86/intel/bts: Set event->hw.itrace_started in pmu::start to match the new logic
        perf tools: Fix use of wrong event when processing exit events
        perf tools: Fix parse_events_add_pmu caller
      a706797f
  2. Sep 17, 2015
    • Linus Torvalds's avatar
      Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9786cff3
      Linus Torvalds authored
      Pull locking fixes from Ingo Molnar:
       "Spinlock performance regression fix, plus documentation fixes"
      
      * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        locking/static_keys: Fix up the static keys documentation
        locking/qspinlock/x86: Only emit the test-and-set fallback when building guest support
        locking/qspinlock/x86: Fix performance regression under unaccelerated VMs
        locking/static_keys: Fix a silly typo
      9786cff3
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1b3dfde3
      Linus Torvalds authored
      Pull RCU fix from Ingo Molnar:
       "Fix a false positive warning"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        security/device_cgroup: Fix RCU_LOCKDEP_WARN() condition
      1b3dfde3
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 72714841
      Linus Torvalds authored
      Pull rdma driver move from Doug Ledford:
       "This is a move only, no functional changes.
      
        I tried to get it in prior to the rc1 release, but we were waiting on
        IBM to get back to us that they were OK with the deprecation and
        eventual removal of this driver.  That OK didn't materialize until
        last week, so integration and testing time pushed us beyond the rc1
        release.
      
        Summary:
      
         - Move ehca driver to staging/rdma and schedule for deletion"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
        IB/ehca: Deprecate driver, move to staging, schedule deletion
      72714841
  3. Sep 16, 2015
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus-v4.3-rc2' of... · 30255100
      Linus Torvalds authored
      Merge tag 'hwmon-for-linus-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fixes from Guenter Roeck:
       "Two patches for the nct6775 driver: add support for NCT6793D, and fix
        swapped registers"
      
      * tag 'hwmon-for-linus-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (nct6775) Add support for NCT6793D
        hwmon: (nct6775) Swap STEP_UP_TIME and STEP_DOWN_TIME registers for most chips
      30255100
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 9efeaaf9
      Linus Torvalds authored
      Pull pin control fixes from Linus Walleij:
       "This is a first set of pin control fixes for the v4.3 series.  Nothing
        special to say, business as usual.
      
         - Some IS_ERR() fixes from Julia Lawall.  I always wanted the
           compiler to catch these but error pointers by nailing them as an
           err pointer intrinsic type or something seem to be a "no can do".
           In any case, cocinelle is obviously up to the task, better than
           bugs staying around.
      
         - Better error handling for NULL GPIO chips.
      
         - Fix a compile error from the big irq desc refactoring.  I'm
           surprised the fallout wasn't bigger than this"
      
      * tag 'pinctrl-v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: samsung: s3c24xx: fix syntax error
        pinctrl: core: Warn about NULL gpio_chip in pinctrl_ready_for_gpio_range()
        pinctrl: join lines that can be a single line within 80 columns
        pinctrl: digicolor: convert null test to IS_ERR test
        pinctrl: qcom: ssbi: convert null test to IS_ERR test
      9efeaaf9
    • Linus Torvalds's avatar
      Merge tag 'gpio-v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · d1291ebd
      Linus Torvalds authored
      Pull GPIO fixes from Linus Walleij:
       "This is the first round of GPIO fixes for v4.3.  Quite a lot of
        patches, but the influx of new stuff in the merge window was equally
        big, so I'm not surprised.
      
         - Return value checks and thus nicer errorpath for two drivers.
      
         - Make GPIO_RCAR arch neutral.
      
         - Propagate errors from GPIO chip ->get() vtable call.  It turned out
           these can actually fail sometimes, especially on slowpath
           controllers doing I2C traffic and similar.
      
         - Update documentation to be in sync with the massive changes in the
           v4.3 merge window, phew.
      
         - Handle deferred probe properly in the OMAP driver.
      
         - Get rid of surplus MODULE_ALIAS() from sx150x"
      
      * tag 'gpio-v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: omap: Fix GPIO numbering for deferred probe
        Documentation: gpio: Explain that <function>-gpio is also supported
        gpio: omap: Fix gpiochip_add() handling for deferred probe
        gpio: sx150x: Remove unnecessary MODULE_ALIAS()
        Documentation: gpio: board: describe the con_id parameter
        Documentation: gpio: board: add flags parameter to gpiod_get*() functions
        gpio: Propagate errors from chip->get()
        gpio: rcar: GPIO_RCAR doesn't relate to ARM
        gpio: mxs: need to check return value of irq_alloc_generic_chip
        gpio: mxc: need to check return value of irq_alloc_generic_chip
      d1291ebd
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · aa57e0b2
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       "This fixes the following issues:
      
         - The selftest overreads the IV test vector.
      
        - Fix potential infinite loop in sunxi-ss driver.
      
         - Fix powerpc build failure when VMX is set without VSX"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: testmgr - don't copy from source IV too much
        crypto: sunxi-ss - Fix a possible driver hang with ciphers
        crypto: vmx - VMX crypto should depend on CONFIG_VSX
      aa57e0b2
    • David Woodhouse's avatar
      x86/platform: Fix Geode LX timekeeping in the generic x86 build · 03da3ff1
      David Woodhouse authored
      In 2007, commit 07190a08
      
       ("Mark TSC on GeodeLX reliable")
      bypassed verification of the TSC on Geode LX. However, this code
      (now in the check_system_tsc_reliable() function in
      arch/x86/kernel/tsc.c) was only present if CONFIG_MGEODE_LX was
      set.
      
      OpenWRT has recently started building its generic Geode target
      for Geode GX, not LX, to include support for additional
      platforms. This broke the timekeeping on LX-based devices,
      because the TSC wasn't marked as reliable:
      https://dev.openwrt.org/ticket/20531
      
      By adding a runtime check on is_geode_lx(), we can also include
      the fix if CONFIG_MGEODEGX1 or CONFIG_X86_GENERIC are set, thus
      fixing the problem.
      
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Cc: Andres Salomon <dilinger@queued.net>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Marcelo Tosatti <marcelo@kvack.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: stable@vger.kernel.org
      Link: http://lkml.kernel.org/r/1442409003.131189.87.camel@infradead.org
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      03da3ff1
    • Ingo Molnar's avatar
      Merge tag 'perf-urgent-for-mingo' of... · f6cf87f7
      Ingo Molnar authored
      
      Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      
      Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
      
      - Fix segfault pressing -> in 'perf top' with no hist entries. (Wang Nan)
      
         E.g:
      	perf top -e page-faults --pid 11400 # 11400 generates no page-fault
      
      - Fix propagation of thread and cpu maps, that got broken when doing incomplete
        changes to better support events with a PMU cpu mask, leading to Intel PT to
        fail with an error like:
      
          $ perf record -e intel_pt//u uname
          Error: The sys_perf_event_open() syscall returned with
                    22 (Invalid argument) for event (sched:sched_switch).
      
        Because intel_pt adds that sched:sched_switch evsel to the evlist after the
        thread/cpu maps were propagated to the evsels, fix it. (Adrian Hunter)
      
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      f6cf87f7
    • Tony Luck's avatar
    • David Woodhouse's avatar
      modsign: Fix GPL/OpenSSL licence incompatibility · 09a77a88
      David Woodhouse authored
      
      
      The GPL does not permit us to link against the OpenSSL library. Use
      LGPL for sign-file and extract-file instead.
      
      [ The whole "openssl isn't compatible with gpl" is really just
        fear-mongering, but there's no reason not to make modsign LGPL, so
        nobody cares.  - Linus ]
      
      Reported-by: default avatarJulian Andres Klode <jak@jak-linux.org>
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Reviewed-by: default avatarJulian Andres Klode <jak@jak-linux.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      09a77a88
  4. Sep 15, 2015
  5. Sep 14, 2015
    • Juergen Gross's avatar
      x86/paravirt: Remove the unused pv_time_ops::get_tsc_khz method · cda34fc7
      Juergen Gross authored
      
      
      It's not used anywhere.
      
      Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
      Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      Cc: Andy Lutomirski <luto@amacapital.net>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Brian Gerst <brgerst@gmail.com>
      Cc: Denys Vlasenko <dvlasenk@redhat.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: akataria@vmware.com
      Cc: chrisw@sous-sol.org
      Cc: jeremy@goop.org
      Cc: virtualization@lists.linux-foundation.org
      Link: http://lkml.kernel.org/r/1442227343-403-1-git-send-email-jgross@suse.com
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      cda34fc7
    • Jan Beulich's avatar
      x86/ldt: Fix small LDT allocation for Xen · f454b478
      Jan Beulich authored
      While the following commit:
      
        37868fe1
      
       ("x86/ldt: Make modify_ldt synchronous")
      
      added a nice comment explaining that Xen needs page-aligned
      whole page chunks for guest descriptor tables, it then
      nevertheless used kzalloc() on the small size path.
      
      As I'm unaware of guarantees for kmalloc(PAGE_SIZE, ) to return
      page-aligned memory blocks, I believe this needs to be switched
      back to __get_free_page() (or better get_zeroed_page()).
      
      Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
      Cc: Andy Lutomirski <luto@amacapital.net>
      Cc: Andy Lutomirski <luto@kernel.org>
      Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Brian Gerst <brgerst@gmail.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Cc: Denys Vlasenko <dvlasenk@redhat.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Link: http://lkml.kernel.org/r/55E735D6020000780009F1E6@prv-mh.provo.novell.com
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      f454b478
    • Viresh Kumar's avatar
      clockevents: Remove unused set_mode() callback · eef7635a
      Viresh Kumar authored
      
      
      All users are migrated to the per-state callbacks, get rid of the
      unused interface and the core support code.
      
      Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: linaro-kernel@lists.linaro.org
      Cc: John Stultz <john.stultz@linaro.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lkml.kernel.org/r/fd60de14cf6d125489c031207567bb255ad946f6.1441943991.git.viresh.kumar@linaro.org
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      eef7635a
    • Ingo Molnar's avatar
      x86/vm86: Fix the misleading CONFIG_VM86 Kconfig help text · 1e642812
      Ingo Molnar authored
      
      
      The CONFIG_VM86 Kconfig help text is actively misleading, so fix it:
      
        - Don't mark it 'obsolete' in the text as we'll support the ABI as long as CPUs
          support it.
      
        - Qualify the part about software emulation and mention that for some apps you
          want a real vm86 mode.
      
        - Don't scare users away from the option, instead explain what it does.
      
      Reported-by: default avatarStas Sergeev <stsp@list.ru>
      Cc: Andy Lutomirski <luto@kernel.org>
      Cc: Arjan van de Ven <arjan@linux.intel.com>
      Cc: Austin S Hemmelgarn <ahferroin7@gmail.com>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Brian Gerst <brgerst@gmail.com>
      Cc: Josh Boyer <jwboyer@fedoraproject.org>
      Cc: Kees Cook <keescook@chromium.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Matthew Garrett <mjg59@srcf.ucam.org>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: linux-kernel@vger.kernel.org
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      1e642812