1. 11 Nov, 2015 2 commits
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-tools' · f57ab32a
      Rafael J. Wysocki authored
      * pm-tools:
        Creating a common structure initialization pattern for struct option
        cpupower: Enable disabled Cstates if they are below max latency
        cpupower: Remove debug message when using cpupower idle-set -D switch
        cpupower: cpupower monitor reports uninitialized values for offline cpus
        tools/power turbostat: bugfix: print MAX_NON_TURBO_RATIO
        tools/power turbostat: simplify Bzy_MHz calculation
      f57ab32a
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-domains' · f6f18a26
      Rafael J. Wysocki authored
      * pm-domains:
        PM / Domains: Allocate memory outside domain locks
        PM / Domains: Remove dev->driver check for runtime PM
      f6f18a26
  2. 10 Nov, 2015 1 commit
  3. 07 Nov, 2015 13 commits
  4. 06 Nov, 2015 5 commits
  5. 05 Nov, 2015 4 commits
    • Nicolas Pitre's avatar
      cpufreq: s5pv210-cpufreq: fix wrong do_div() usage · d7e53e35
      Nicolas Pitre authored
      It is wrong to use do_div() with 32-bit dividends (unsigned long is
      32 bits on 32-bit architectures).
      Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
      Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
      Reviewed-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      d7e53e35
    • Srinivas Pandruvada's avatar
      MAINTAINERS: update for intel P-state driver · 58ac1f62
      Srinivas Pandruvada authored
      Add Srinivas Pandruvada and Len Brown as maintainers and remove
      Kristen Carlson Accardi from the list of maintainers.
      Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
      [ rjw: Changelog ]
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      58ac1f62
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.4-rc1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 0d51ce9c
      Linus Torvalds authored
      Pull power management and ACPI updates from Rafael Wysocki:
       "Quite a new features are included this time.
      
        First off, the Collaborative Processor Performance Control interface
        (version 2) defined by ACPI will now be supported on ARM64 along with
        a cpufreq frontend for CPU performance scaling.
      
        Second, ACPI gets a new infrastructure for the early probing of IRQ
        chips and clock sources (along the lines of the existing similar
        mechanism for DT).
      
        Next, the ACPI core and the generic device properties API will now
        support a recently introduced hierarchical properties extension of the
        _DSD (Device Specific Data) ACPI device configuration object.  If the
        ACPI platform firmware uses that extension to organize device
        properties in a hierarchical way, the kernel will automatically handle
        it and make those properties available to device drivers via the
        generic device properties API.
      
        It also will be possible to build the ACPICA's AML interpreter
        debugger into the kernel now and use that to diagnose AML-related
        problems more efficiently.  In the future, this should make it
        possible to single-step AML execution and do similar things.
        Interesting stuff, although somewhat experimental at this point.
      
        Finally, the PM core gets a new mechanism that can be used by device
        drivers to distinguish between suspend-to-RAM (based on platform
        firmware support) and suspend-to-idle (or other variants of system
        suspend the platform firmware is not involved in) and possibly
        optimize their device suspend/resume handling accordingly.
      
        In addition to that, some existing features are re-organized quite
        substantially.
      
        First, the ACPI-based handling of PCI host bridges on x86 and ia64 is
        unified and the common code goes into the ACPI core (so as to reduce
        code duplication and eliminate non-essential differences between the
        two architectures in that area).
      
        Second, the Operating Performance Points (OPP) framework is
        reorganized to make the code easier to find and follow.
      
        Next, the cpufreq core's sysfs interface is reorganized to get rid of
        the "primary CPU" concept for configurations in which the same
        performance scaling settings are shared between multiple CPUs.
      
        Finally, some interfaces that aren't necessary any more are dropped
        from the generic power domains framework.
      
        On top of the above we have some minor extensions, cleanups and bug
        fixes in multiple places, as usual.
      
        Specifics:
      
         - ACPICA update to upstream revision 20150930 (Bob Moore, Lv Zheng).
      
           The most significant change is to allow the AML debugger to be
           built into the kernel.  On top of that there is an update related
           to the NFIT table (the ACPI persistent memory interface) and a few
           fixes and cleanups.
      
         - ACPI CPPC2 (Collaborative Processor Performance Control v2) support
           along with a cpufreq frontend (Ashwin Chaugule).
      
           This can only be enabled on ARM64 at this point.
      
         - New ACPI infrastructure for the early probing of IRQ chips and
           clock sources (Marc Zyngier).
      
         - Support for a new hierarchical properties extension of the ACPI
           _DSD (Device Specific Data) device configuration object allowing
           the kernel to handle hierarchical properties (provided by the
           platform firmware this way) automatically and make them available
           to device drivers via the generic device properties interface
           (Rafael Wysocki).
      
         - Generic device properties API extension to obtain an index of
           certain string value in an array of strings, along the lines of
           of_property_match_string(), but working for all of the supported
           firmware node types, and support for the "dma-names" device
           property based on it (Mika Westerberg).
      
         - ACPI core fix to parse the MADT (Multiple APIC Description Table)
           entries in the order expected by platform firmware (and mandated by
           the specification) to avoid confusion on systems with more than 255
           logical CPUs (Lukasz Anaczkowski).
      
         - Consolidation of the ACPI-based handling of PCI host bridges on x86
           and ia64 (Jiang Liu).
      
         - ACPI core fixes to ensure that the correct IRQ number is used to
           represent the SCI (System Control Interrupt) in the cases when it
           has been re-mapped (Chen Yu).
      
         - New ACPI backlight quirk for Lenovo IdeaPad S405 (Hans de Goede).
      
         - ACPI EC driver fixes (Lv Zheng).
      
         - Assorted ACPI fixes and cleanups (Dan Carpenter, Insu Yun, Jiri
           Kosina, Rami Rosen, Rasmus Villemoes).
      
         - New mechanism in the PM core allowing drivers to check if the
           platform firmware is going to be involved in the upcoming system
           suspend or if it has been involved in the suspend the system is
           resuming from at the moment (Rafael Wysocki).
      
           This should allow drivers to optimize their suspend/resume handling
           in some cases and the changes include a couple of users of it (the
           i8042 input driver, PCI PM).
      
         - PCI PM fix to prevent runtime-suspended devices with PME enabled
           from being resumed during system suspend even if they aren't
           configured to wake up the system from sleep (Rafael Wysocki).
      
         - New mechanism to report the number of a wakeup IRQ that woke up the
           system from sleep last time (Alexandra Yates).
      
         - Removal of unused interfaces from the generic power domains
           framework and fixes related to latency measurements in that code
           (Ulf Hansson, Daniel Lezcano).
      
         - cpufreq core sysfs interface rework to make it handle CPUs that
           share performance scaling settings (represented by a common cpufreq
           policy object) more symmetrically (Viresh Kumar).
      
           This should help to simplify the CPU offline/online handling among
           other things.
      
         - cpufreq core fixes and cleanups (Viresh Kumar).
      
         - intel_pstate fixes related to the Turbo Activation Ratio (TAR)
           mechanism on client platforms which causes the turbo P-states range
           to vary depending on platform firmware settings (Srinivas
           Pandruvada).
      
         - intel_pstate sysfs interface fix (Prarit Bhargava).
      
         - Assorted cpufreq driver (imx, tegra20, powernv, integrator) fixes
           and cleanups (Bai Ping, Bartlomiej Zolnierkiewicz, Shilpasri G
           Bhat, Luis de Bethencourt).
      
         - cpuidle mvebu driver cleanups (Russell King).
      
         - OPP (Operating Performance Points) framework code reorganization to
           make it more maintainable (Viresh Kumar).
      
         - Intel Broxton support for the RAPL (Running Average Power Limits)
           power capping driver (Amy Wiles).
      
         - Assorted power management code fixes and cleanups (Dan Carpenter,
           Geert Uytterhoeven, Geliang Tang, Luis de Bethencourt, Rasmus
           Villemoes)"
      
      * tag 'pm+acpi-4.4-rc1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (108 commits)
        cpufreq: postfix policy directory with the first CPU in related_cpus
        cpufreq: create cpu/cpufreq/policyX directories
        cpufreq: remove cpufreq_sysfs_{create|remove}_file()
        cpufreq: create cpu/cpufreq at boot time
        cpufreq: Use cpumask_copy instead of cpumask_or to copy a mask
        cpufreq: ondemand: Drop unnecessary locks from update_sampling_rate()
        PM / Domains: Merge measurements for PM QoS device latencies
        PM / Domains: Don't measure ->start|stop() latency in system PM callbacks
        PM / clk: Fix broken build due to non-matching code and header #ifdefs
        ACPI / Documentation: add copy_dsdt to ACPI format options
        ACPI / sysfs: correctly check failing memory allocation
        ACPI / video: Add a quirk to force native backlight on Lenovo IdeaPad S405
        ACPI / CPPC: Fix potential memory leak
        ACPI / CPPC: signedness bug in register_pcc_channel()
        ACPI / PAD: power_saving_thread() is not freezable
        ACPI / PM: Fix incorrect wakeup IRQ setting during suspend-to-idle
        ACPI: Using correct irq when waiting for events
        ACPI: Use correct IRQ when uninstalling ACPI interrupt handler
        cpuidle: mvebu: disable the bind/unbind attributes and use builtin_platform_driver
        cpuidle: mvebu: clean up multiple platform drivers
        ...
      0d51ce9c
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.4-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 41ecf140
      Linus Torvalds authored
      Pull xen updates from David Vrabel:
      
       - Improve balloon driver memory hotplug placement.
      
       - Use unpopulated hotplugged memory for foreign pages (if
         supported/enabled).
      
       - Support 64 KiB guest pages on arm64.
      
       - CPU hotplug support on arm/arm64.
      
      * tag 'for-linus-4.4-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (44 commits)
        xen: fix the check of e_pfn in xen_find_pfn_range
        x86/xen: add reschedule point when mapping foreign GFNs
        xen/arm: don't try to re-register vcpu_info on cpu_hotplug.
        xen, cpu_hotplug: call device_offline instead of cpu_down
        xen/arm: Enable cpu_hotplug.c
        xenbus: Support multiple grants ring with 64KB
        xen/grant-table: Add an helper to iterate over a specific number of grants
        xen/xenbus: Rename *RING_PAGE* to *RING_GRANT*
        xen/arm: correct comment in enlighten.c
        xen/gntdev: use types from linux/types.h in userspace headers
        xen/gntalloc: use types from linux/types.h in userspace headers
        xen/balloon: Use the correct sizeof when declaring frame_list
        xen/swiotlb: Add support for 64KB page granularity
        xen/swiotlb: Pass addresses rather than frame numbers to xen_arch_need_swiotlb
        arm/xen: Add support for 64KB page granularity
        xen/privcmd: Add support for Linux 64KB page granularity
        net/xen-netback: Make it running on 64KB page granularity
        net/xen-netfront: Make it running on 64KB page granularity
        block/xen-blkback: Make it running on 64KB page granularity
        block/xen-blkfront: Make it running on 64KB page granularity
        ...
      41ecf140
  6. 04 Nov, 2015 15 commits
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 2dc10ad8
      Linus Torvalds authored
      Pull arm64 updates from Catalin Marinas:
      
       - "genirq: Introduce generic irq migration for cpu hotunplugged" patch
         merged from tip/irq/for-arm to allow the arm64-specific part to be
         upstreamed via the arm64 tree
      
       - CPU feature detection reworked to cope with heterogeneous systems
         where CPUs may not have exactly the same features.  The features
         reported by the kernel via internal data structures or ELF_HWCAP are
         delayed until all the CPUs are up (and before user space starts)
      
       - Support for 16KB pages, with the additional bonus of a 36-bit VA
         space, though the latter only depending on EXPERT
      
       - Implement native {relaxed, acquire, release} atomics for arm64
      
       - New ASID allocation algorithm which avoids IPI on roll-over, together
         with TLB invalidation optimisations (using local vs global where
         feasible)
      
       - KASan support for arm64
      
       - EFI_STUB clean-up and isolation for the kernel proper (required by
         KASan)
      
       - copy_{to,from,in}_user optimisations (sharing the memcpy template)
      
       - perf: moving arm64 to the arm32/64 shared PMU framework
      
       - L1_CACHE_BYTES increased to 128 to accommodate Cavium hardware
      
       - Support for the contiguous PTE hint on kernel mapping (16 consecutive
         entries may be able to use a single TLB entry)
      
       - Generic CONFIG_HZ now used on arm64
      
       - defconfig updates
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (91 commits)
        arm64/efi: fix libstub build under CONFIG_MODVERSIONS
        ARM64: Enable multi-core scheduler support by default
        arm64/efi: move arm64 specific stub C code to libstub
        arm64: page-align sections for DEBUG_RODATA
        arm64: Fix build with CONFIG_ZONE_DMA=n
        arm64: Fix compat register mappings
        arm64: Increase the max granular size
        arm64: remove bogus TASK_SIZE_64 check
        arm64: make Timer Interrupt Frequency selectable
        arm64/mm: use PAGE_ALIGNED instead of IS_ALIGNED
        arm64: cachetype: fix definitions of ICACHEF_* flags
        arm64: cpufeature: declare enable_cpu_capabilities as static
        genirq: Make the cpuhotplug migration code less noisy
        arm64: Constify hwcap name string arrays
        arm64/kvm: Make use of the system wide safe values
        arm64/debug: Make use of the system wide safe value
        arm64: Move FP/ASIMD hwcap handling to common code
        arm64/HWCAP: Use system wide safe values
        arm64/capabilities: Make use of system wide safe value
        arm64: Delay cpu feature capability checks
        ...
      2dc10ad8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · e627078a
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "There is only one new feature in this pull for the 4.4 merge window,
        most of it is small enhancements, cleanup and bug fixes:
      
         - Add the s390 backend for the software dirty bit tracking.  This
           adds two new pgtable functions pte_clear_soft_dirty and
           pmd_clear_soft_dirty which is why there is a hit to
           arch/x86/include/asm/pgtable.h in this pull request.
      
         - A series of cleanup patches for the AP bus, this includes the
           removal of the support for two outdated crypto cards (PCICC and
           PCICA).
      
         - The irq handling / signaling on buffer full in the runtime
           instrumentation code is dropped.
      
         - Some micro optimizations: remove unnecessary memory barriers for a
           couple of functions: [smb_]rmb, [smb_]wmb, atomics, bitops, and for
           spin_unlock.  Use the builtin bswap if available and make
           test_and_set_bit_lock more cache friendly.
      
         - Statistics and a tracepoint for the diagnose calls to the
           hypervisor.
      
         - The CPU measurement facility support to sample KVM guests is
           improved.
      
         - The vector instructions are now always enabled for user space
           processes if the hardware has the vector facility.  This simplifies
           the FPU handling code.  The fpu-internal.h header is split into fpu
           internals, api and types just like x86.
      
         - Cleanup and improvements for the common I/O layer.
      
         - Rework udelay to solve a problem with kprobe.  udelay has busy loop
           semantics but still uses an idle processor state for the wait"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (66 commits)
        s390: remove runtime instrumentation interrupts
        s390/cio: de-duplicate subchannel validation
        s390/css: unneeded initialization in for_each_subchannel
        s390/Kconfig: use builtin bswap
        s390/dasd: fix disconnected device with valid path mask
        s390/dasd: fix invalid PAV assignment after suspend/resume
        s390/dasd: fix double free in dasd_eckd_read_conf
        s390/kernel: fix ptrace peek/poke for floating point registers
        s390/cio: move ccw_device_stlck functions
        s390/cio: move ccw_device_call_handler
        s390/topology: reduce per_cpu() invocations
        s390/nmi: reduce size of percpu variable
        s390/nmi: fix terminology
        s390/nmi: remove casts
        s390/nmi: remove pointless error strings
        s390: don't store registers on disabled wait anymore
        s390: get rid of __set_psw_mask()
        s390/fpu: split fpu-internal.h into fpu internals, api, and type headers
        s390/dasd: fix list_del corruption after lcu changes
        s390/spinlock: remove unneeded serializations at unlock
        ...
      e627078a
    • Linus Torvalds's avatar
      Merge branch 'parisc-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 14c79092
      Linus Torvalds authored
      Pull parisc updates from Helge Deller:
       "The most important change is that we reduce L1_CACHE_BYTES to 16
        bytes, for which a trivial patch for XPS in the network layer was
        needed.  Then we wire up the sys_membarrier and userfaultfd syscalls
        and added two other small cleanups"
      
      * 'parisc-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Change L1_CACHE_BYTES to 16
        net/xps: Fix calculation of initial number of xps queues
        parisc: reduce syslog debug output
        parisc: serial/mux: Convert to uart_console_device instead of open-coded
        parisc: Wire up userfaultfd syscall
        parisc: allocate sys_membarrier system call number
      14c79092
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 1b1050cd
      Linus Torvalds authored
      Pull IDE fixlet from David Miller:
       "Just a y2038 fix to the pdc202xx_new IDE driver"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: pdc202xx_new: Replace timeval with ktime_t
      1b1050cd
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · b0f85fa1
      Linus Torvalds authored
      Pull networking updates from David Miller:
      
      Changes of note:
      
       1) Allow to schedule ICMP packets in IPVS, from Alex Gartrell.
      
       2) Provide FIB table ID in ipv4 route dumps just as ipv6 does, from
          David Ahern.
      
       3) Allow the user to ask for the statistics to be filtered out of
          ipv4/ipv6 address netlink dumps.  From Sowmini Varadhan.
      
       4) More work to pass the network namespace context around deep into
          various packet path APIs, starting with the netfilter hooks.  From
          Eric W Biederman.
      
       5) Add layer 2 TX/RX checksum offloading to qeth driver, from Thomas
          Richter.
      
       6) Use usec resolution for SYN/ACK RTTs in TCP, from Yuchung Cheng.
      
       7) Support Very High Throughput in wireless MESH code, from Bob
          Copeland.
      
       8) Allow setting the ageing_time in switchdev/rocker.  From Scott
          Feldman.
      
       9) Properly autoload L2TP type modules, from Stephen Hemminger.
      
      10) Fix and enable offload features by default in 8139cp driver, from
          David Woodhouse.
      
      11) Support both ipv4 and ipv6 sockets in a single vxlan device, from
          Jiri Benc.
      
      12) Fix CWND limiting of thin streams in TCP, from Bendik Rønning
          Opstad.
      
      13) Fix IPSEC flowcache overflows on large systems, from Steffen
          Klassert.
      
      14) Convert bridging to track VLANs using rhashtable entries rather than
          a bitmap.  From Nikolay Aleksandrov.
      
      15) Make TCP listener handling completely lockless, this is a major
          accomplishment.  Incoming request sockets now live in the
          established hash table just like any other socket too.
      
          From Eric Dumazet.
      
      15) Provide more bridging attributes to netlink, from Nikolay
          Aleksandrov.
      
      16) Use hash based algorithm for ipv4 multipath routing, this was very
          long overdue.  From Peter Nørlund.
      
      17) Several y2038 cures, mostly avoiding timespec.  From Arnd Bergmann.
      
      18) Allow non-root execution of EBPF programs, from Alexei Starovoitov.
      
      19) Support SO_INCOMING_CPU as setsockopt, from Eric Dumazet.  This
          influences the port binding selection logic used by SO_REUSEPORT.
      
      20) Add ipv6 support to VRF, from David Ahern.
      
      21) Add support for Mellanox Spectrum switch ASIC, from Jiri Pirko.
      
      22) Add rtl8xxxu Realtek wireless driver, from Jes Sorensen.
      
      23) Implement RACK loss recovery in TCP, from Yuchung Cheng.
      
      24) Support multipath routes in MPLS, from Roopa Prabhu.
      
      25) Fix POLLOUT notification for listening sockets in AF_UNIX, from Eric
          Dumazet.
      
      26) Add new QED Qlogic river, from Yuval Mintz, Manish Chopra, and
          Sudarsana Kalluru.
      
      27) Don't fetch timestamps on AF_UNIX sockets, from Hannes Frederic
          Sowa.
      
      28) Support ipv6 geneve tunnels, from John W Linville.
      
      29) Add flood control support to switchdev layer, from Ido Schimmel.
      
      30) Fix CHECKSUM_PARTIAL handling of potentially fragmented frames, from
          Hannes Frederic Sowa.
      
      31) Support persistent maps and progs in bpf, from Daniel Borkmann.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1790 commits)
        sh_eth: use DMA barriers
        switchdev: respect SKIP_EOPNOTSUPP flag in case there is no recursion
        net: sched: kill dead code in sch_choke.c
        irda: Delete an unnecessary check before the function call "irlmp_unregister_service"
        net: dsa: mv88e6xxx: include DSA ports in VLANs
        net: dsa: mv88e6xxx: disable SA learning for DSA and CPU ports
        net/core: fix for_each_netdev_feature
        vlan: Invoke driver vlan hooks only if device is present
        arcnet/com20020: add LEDS_CLASS dependency
        bpf, verifier: annotate verbose printer with __printf
        dp83640: Only wait for timestamps for packets with timestamping enabled.
        ptp: Change ptp_class to a proper bitmask
        dp83640: Prune rx timestamp list before reading from it
        dp83640: Delay scheduled work.
        dp83640: Include hash in timestamp/packet matching
        ipv6: fix tunnel error handling
        net/mlx5e: Fix LSO vlan insertion
        net/mlx5e: Re-eanble client vlan TX acceleration
        net/mlx5e: Return error in case mlx5e_set_features() fails
        net/mlx5e: Don't allow more than max supported channels
        ...
      b0f85fa1
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · ccc9d4a6
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       "API:
      
         - Add support for cipher output IVs in testmgr
         - Add missing crypto_ahash_blocksize helper
         - Mark authenc and des ciphers as not allowed under FIPS.
      
      Algorithms:
      
         - Add CRC support to 842 compression
         - Add keywrap algorithm
         - A number of changes to the akcipher interface:
            + Separate functions for setting public/private keys.
            + Use SG lists.
      
      Drivers:
      
         - Add Intel SHA Extension optimised SHA1 and SHA256
         - Use dma_map_sg instead of custom functions in crypto drivers
         - Add support for STM32 RNG
         - Add support for ST RNG
         - Add Device Tree support to exynos RNG driver
         - Add support for mxs-dcp crypto device on MX6SL
         - Add xts(aes) support to caam
         - Add ctr(aes) and xts(aes) support to qat
         - A large set of fixes from Russell King for the marvell/cesa driver"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (115 commits)
        crypto: asymmetric_keys - Fix unaligned access in x509_get_sig_params()
        crypto: akcipher - Don't #include crypto/public_key.h as the contents aren't used
        hwrng: exynos - Add Device Tree support
        hwrng: exynos - Fix missing configuration after suspend to RAM
        hwrng: exynos - Add timeout for waiting on init done
        dt-bindings: rng: Describe Exynos4 PRNG bindings
        crypto: marvell/cesa - use __le32 for hardware descriptors
        crypto: marvell/cesa - fix missing cpu_to_le32() in mv_cesa_dma_add_op()
        crypto: marvell/cesa - use memcpy_fromio()/memcpy_toio()
        crypto: marvell/cesa - use gfp_t for gfp flags
        crypto: marvell/cesa - use dma_addr_t for cur_dma
        crypto: marvell/cesa - use readl_relaxed()/writel_relaxed()
        crypto: caam - fix indentation of close braces
        crypto: caam - only export the state we really need to export
        crypto: caam - fix non-block aligned hash calculation
        crypto: caam - avoid needlessly saving and restoring caam_hash_ctx
        crypto: caam - print errno code when hash registration fails
        crypto: marvell/cesa - fix memory leak
        crypto: marvell/cesa - fix first-fragment handling in mv_cesa_ahash_dma_last_req()
        crypto: marvell/cesa - rearrange handling for sw padded hashes
        ...
      ccc9d4a6
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 66ef3493
      Linus Torvalds authored
      Pull x86 platform changes from Ingo Molnar:
       "Misc updates to the Intel MID and SGI UV platforms"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/intel-mid: Make intel_mid_ops static
        arch/x86/intel-mid: Use kmemdup rather than duplicating its implementation
        x86/platform/uv: Implement simple dump failover if kdump fails
        x86/platform/uv: Insert per_cpu accessor function on uv_hub_nmi
      66ef3493
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 639ab3eb
      Linus Torvalds authored
      Pull x86 mm changes from Ingo Molnar:
       "The main changes are: continued PAT work by Toshi Kani, plus a new
        boot time warning about insecure RWX kernel mappings, by Stephen
        Smalley.
      
        The new CONFIG_DEBUG_WX=y warning is marked default-y if
        CONFIG_DEBUG_RODATA=y is already eanbled, as a special exception, as
        these bugs are hard to notice and this check already found several
        live bugs"
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm: Warn on W^X mappings
        x86/mm: Fix no-change case in try_preserve_large_page()
        x86/mm: Fix __split_large_page() to handle large PAT bit
        x86/mm: Fix try_preserve_large_page() to handle large PAT bit
        x86/mm: Fix gup_huge_p?d() to handle large PAT bit
        x86/mm: Fix slow_virt_to_phys() to handle large PAT bit
        x86/mm: Fix page table dump to show PAT bit
        x86/asm: Add pud_pgprot() and pmd_pgprot()
        x86/asm: Fix pud/pmd interfaces to handle large PAT bit
        x86/asm: Add pud/pmd mask interfaces to handle large PAT bit
        x86/asm: Move PUD_PAGE macros to page_types.h
        x86/vdso32: Define PGTABLE_LEVELS to 32bit VDSO
      639ab3eb
    • Linus Torvalds's avatar
      Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4302d506
      Linus Torvalds authored
      Pull x86 sigcontext header cleanups from Ingo Molnar:
       "This series reorganizes and cleans up various aspects of the main
        sigcontext UAPI headers, such as unifying the data structures and
        updating/adding lots of comments to explain all the ABI details and
        quirks.  The headers can now also be built in user-space standalone"
      
      * 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/headers: Clean up too long lines
        x86/headers: Remove <asm/sigcontext.h> references on the kernel side
        x86/headers: Remove direct sigcontext32.h uses
        x86/headers: Convert sigcontext_ia32 uses to sigcontext_32
        x86/headers: Unify 'struct sigcontext_ia32' and 'struct sigcontext_32'
        x86/headers: Make sigcontext pointers bit independent
        x86/headers: Move the 'struct sigcontext' definitions into the UAPI header
        x86/headers: Clean up the kernel's struct sigcontext types to be ABI-clean
        x86/headers: Convert uses of _fpstate_ia32 to _fpstate_32
        x86/headers: Unify 'struct _fpstate_ia32' and i386 struct _fpstate
        x86/headers: Unify register type definitions between 32-bit compat and i386
        x86/headers: Use ABI types consistently in sigcontext*.h
        x86/headers: Separate out legacy user-space structure definitions
        x86/headers: Clean up and better document uapi/asm/sigcontext.h
        x86/headers: Clean up uapi/asm/sigcontext32.h
        x86/headers: Fix (old) header file dependency bug in uapi/asm/sigcontext32.h
      4302d506
    • Linus Torvalds's avatar
      Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ce4d72fa
      Linus Torvalds authored
      Pull x86 fpu changes from Ingo Molnar:
       "There are two main areas of changes:
      
         - Rework of the extended FPU state code to robustify the kernel's
           usage of cpuid provided xstate sizes - and related changes (Dave
           Hansen)"
      
         - math emulation enhancements: new modern FPU instructions support,
           with testcases, plus cleanups (Denys Vlasnko)"
      
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
        x86/fpu: Fixup uninitialized feature_name warning
        x86/fpu/math-emu: Add support for FISTTP instructions
        x86/fpu/math-emu, selftests: Add test for FISTTP instructions
        x86/fpu/math-emu: Add support for FCMOVcc insns
        x86/fpu/math-emu: Add support for F[U]COMI[P] insns
        x86/fpu/math-emu: Remove define layer for undocumented opcodes
        x86/fpu/math-emu, selftests: Add tests for FCMOV and FCOMI insns
        x86/fpu/math-emu: Remove !NO_UNDOC_CODE
        x86/fpu: Check CPU-provided sizes against struct declarations
        x86/fpu: Check to ensure increasing-offset xstate offsets
        x86/fpu: Correct and check XSAVE xstate size calculations
        x86/fpu: Add C structures for AVX-512 state components
        x86/fpu: Rework YMM definition
        x86/fpu/mpx: Rework MPX 'xstate' types
        x86/fpu: Add xfeature_enabled() helper instead of test_bit()
        x86/fpu: Remove 'xfeature_nr'
        x86/fpu: Rework XSTATE_* macros to remove magic '2'
        x86/fpu: Rename XFEATURES_NR_MAX
        x86/fpu: Rename XSAVE macros
        x86/fpu: Remove partial LWP support definitions
        ...
      ce4d72fa
    • Linus Torvalds's avatar
      Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0f25f2c1
      Linus Torvalds authored
      Pull x86 kgdb fixlet from Ingo Molnar:
       "A single debugging related commit: compress the memory usage of a kgdb
        data structure"
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/kgdb: Replace bool_int_array[NR_CPUS] with bitmap
      0f25f2c1
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f323c49b
      Linus Torvalds authored
      Pull x86 cpu changes from Ingo Molnar:
       "Two changes in this cycle: a Kconfig help text enhancement, and an AMD
        CLZERO instruction capability detection and enumeration"
      
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/cpu: Add CLZERO detection
        x86/Kconfig/cpus: Fix/complete CPU type help texts
      f323c49b
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 33d46f97
      Linus Torvalds authored
      Pull x86 cleanups from Ingo Molnar:
       "An early_printk cleanup plus deinlining enhancements"
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/early_printk: Set __iomem address space for IO
        x86/signal: Deinline get_sigframe, save 240 bytes
        x86: Deinline early_console_register, save 403 bytes
        x86/e820: Deinline e820_type_to_string, save 126 bytes
      33d46f97
    • Linus Torvalds's avatar
      Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 378e4e98
      Linus Torvalds authored
      Pull x86 boot cleanup from Ingo Molnar:
       "A single commit: remove an obsolete kcrash boot flag"
      
      * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/kexec: Remove obsolete 'in_crash_kexec' flag
      378e4e98
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a75a3f6f
      Linus Torvalds authored
      Pull x86 asm changes from Ingo Molnar:
       "The main change in this cycle is another step in the big x86 system
        call interface rework by Andy Lutomirski, which moves most of the low
        level x86 entry code from assembly to C, for all syscall entries
        except native 64-bit system calls:
      
          arch/x86/entry/entry_32.S        | 182 ++++------
          arch/x86/entry/entry_64_compat.S | 547 ++++++++-----------------------
          194 insertions(+), 535 deletions(-)
      
        ... our hope is that the final remaining step (converting native
        64-bit system calls) will be less painful as all the previous steps,
        given that most of the legacies and quirks are concentrated around
        native 32-bit and compat environments"
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (47 commits)
        x86/entry/32: Fix FS and GS restore in opportunistic SYSEXIT
        x86/entry/32: Fix entry_INT80_32() to expect interrupts to be on
        um/x86: Fix build after x86 syscall changes
        x86/asm: Remove the xyz_cfi macros from dwarf2.h
        selftests/x86: Style fixes for the 'unwind_vdso' test
        x86/entry/64/compat: Document sysenter_fix_flags's reason for existence
        x86/entry: Split and inline syscall_return_slowpath()
        x86/entry: Split and inline prepare_exit_to_usermode()
        x86/entry: Use pt_regs_to_thread_info() in syscall entry tracing
        x86/entry: Hide two syscall entry assertions behind CONFIG_DEBUG_ENTRY
        x86/entry: Micro-optimize compat fast syscall arg fetch
        x86/entry: Force inlining of 32-bit syscall code
        x86/entry: Make irqs_disabled checks in exit code depend on lockdep
        x86/entry: Remove unnecessary IRQ twiddling in fast 32-bit syscalls
        x86/asm: Remove thread_info.sysenter_return
        x86/entry/32: Re-implement SYSENTER using the new C path
        x86/entry/32: Switch INT80 to the new C syscall path
        x86/entry/32: Open-code return tracking from fork and kthreads
        x86/entry/compat: Implement opportunistic SYSRETL for compat syscalls
        x86/vdso/compat: Wire up SYSENTER and SYSCSALL for compat userspace
        ...
      a75a3f6f