1. 23 Jul, 2015 2 commits
    • Jason Gerecke's avatar
      HID: wacom: Ignore contacts in excess of declared contact count · 1b5d514a
      Jason Gerecke authored
      The reports sent from some touch devices (e.g. the Cintiq 24HDT) contain
      junk data in the contact slots which follow the final "valid" contact.
      To avoid forwarding it to usrspace, we store the reported contact count
      during the pre-process phase and then only process that many contacts.
      If a device sends its contacts across multiple reports (what Microsoft
      refers to as "hybrid" mode) then the contact count will be zero for
      reports other than the first.
      Signed-off-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
      1b5d514a
    • Jason Gerecke's avatar
      HID: wacom: Perform all event processing as part of report processing · 06324e0c
      Jason Gerecke authored
      In some cases, we need access to information before it becomes available
      to the 'event' handler. In particular, for some devices we cannot properly
      process the finger data without first knowing the "contact count" at the
      very end of the report (e.g. the Cintiq 24HDT touch screen, when forced
      through the GENERIC codepath).
      
      Since the HID subsystem doesn't provide a way to take action before 'event'
      is called, we take a cue from hid-multitouch.c and add a pre-process step
      within the 'report' handler that performs the same function.
      Signed-off-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
      06324e0c
  2. 17 Jul, 2015 3 commits
    • Jason Gerecke's avatar
      HID: wacom: Set default device name to value from wacom->features · 2bdd163c
      Jason Gerecke authored
      Allocated input devices should not use the 'pen_name' by default since
      we do not know at that point in time if that is an appropriate choice
      of name. Instead, use the (tool-agnostic) name that is stored in the
      device's 'wacom_features' structure. This also has the nice side-effect
      of requring us to be explicit about the naming of the pen device, as
      we already are for touch and pad devices.
      Signed-off-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
      2bdd163c
    • Jason Gerecke's avatar
      HID: wacom: Properly free inputs if 'wacom_allocate_inputs' fails · d9f2d203
      Jason Gerecke authored
      The 'wacom_allocate_inputs' function tries to allocate three input devices: one
      each for the pen, touch, and pad. The pointers that are returned by the
      'wacom_allocate_input' calls are temporarily stored to local variables where
      they are checked to ensure they're non-null before storing them in the
      'wacom_wac' structure. If an allocation fails,  the 'wacom_free_inputs'
      function is called to reclaim the memory. Unfortunately, 'wacom_free_inputs' is
      called prior to the pointers being copied, so it is not actually able to free
      anything.
      
      This patch has the calls to 'wacom_allocate_input' store the pointer directly
      in the 'wacom_wac' structure where they can be freed. Also, it replaces the
      call to 'wacom_free_inputs' with the (more general) 'wacom_clean_inputs' and
      removes the no-longer-used function.
      
      [jkosina@suse.com: modify to resolve conflict with 67e123ff ("Delete
       unnecessary checks")]
      Signed-off-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
      d9f2d203
    • Jiri Kosina's avatar
      Merge branch 'for-4.3/upstream' into for-4.3/wacom · 57f7e160
      Jiri Kosina authored
      There is a conflict between 67e123ff ("Delete unnecessary checks") sitting
      in for-4.3/upstream and memory allocation failure handling from Jason Gerecke.
      Pull this so that conflict could be resolved.
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
      57f7e160
  3. 13 Jul, 2015 1 commit
  4. 10 Jul, 2015 1 commit
  5. 09 Jul, 2015 1 commit
  6. 08 Jul, 2015 1 commit
  7. 23 Jun, 2015 20 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 67db8a80
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
      
       - spurious power/wakeup sysfs files removal for I2C-HID devices, from
         Andrew Duggan
      
       - Logitech M560 support, from Goffredo Baroncelli
      
       - a lot of housekeeping cleanups to hid-lg4ff driver, from Michal Maly
      
       - improved support for Plantronics devices, from Terry Junge
      
       - Sony Motion Controller and Navigation Controller support and
         subsequent cleanups of hid-sony driver, from Frank Praznik and Simon
         Wood
      
       - HW support improvements to the Wacom driver, from Jason Gerecke and
         Ping Cheng
      
       - assorted small cleanups and device ID additions all over the place
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (69 commits)
        HID: cypress: use swap() in cp_report_fixup()
        HID: microsoft: Add Surface Power Cover
        HID: hid-sony: Fix report descriptor for Navigation Controller
        HID: hid-sony: Navigation controller only has 1 LED and no rumble
        HID: hid-sony: Add BT support for Navigation Controller
        HID: wacom: Introduce new 'touch_input' device
        HID: wacom: Split apart 'wacom_setup_pentouch_input_capabilites'
        HID: wacom: Introduce a new WACOM_DEVICETYPE_PAD device_type
        HID: wacom: Treat features->device_type values as flags
        HID: wacom: Simplify 'wacom_update_name'
        HID: rmi: Disable populating F30 when the touchpad has physical buttons
        HID: plantronics: Update to map volume up/down controls
        HID: sony: PS Move fix report descriptor
        HID: sony: PS3 Move enable LEDs and Rumble via BT
        HID: sony: Add support PS3 Move Battery via BT
        HID: sony: Add quirk for MOTION_CONTROLLER_BT
        HID: sony: Support PS3 Move Controller when connected via Bluetooth
        HID: i2c-hid: Do not set the ACPI companion field in the HID device
        usb, HID: Remove Vernier devices from lsusb and hid_ignore_list
        HID: hidpp: Add driver for mouse logitech M560
        ...
      67db8a80
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia · a394c6a0
      Linus Torvalds authored
      Pull PCMCIA update from Dominik Brodowski:
       "A few PCMCIA fixes and cleanups are available in the PCMCIA tree.
      
        Most of them are trivial and self-explanatory.  Of particular note are
        the last three patches which add an important hardware quirk for
        Toshiba ToPIC95 sockets (or BIOS breakage on systems with these
        sockets), fix resource leaks in yenta_socket enable/disable call
        paths, and fix a regression caused by patch 1c6c9b1d since v4.0.
      
        Alan stated he is OK with me pushing this patch upstream.  Once it
        works out well in your tree, I will push it to stable for 4.0/4.1 as
        well"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia:
        pcmcia: do not break rsrc_nonstatic when handling anonymous cards
        pcmcia: Fix resource leaks in yenta_probe() and _close()
        Disable write buffering on Toshiba ToPIC95
        pcmcia: Convert dev_printk to dev_<level>
        pcmcia/vrc4171: Remove typedefs for enums and struct
        pcmcia: Remove typedef in structs and emum
        pcmcia: Remove typedef tuple_flags
        drivers: pcmcia: electra_cf.c fix checkpatch error and warnings
        drivers: pcmcia: ds.c fix checkpatch errors
        PCMCIA: Remove commented references to dead class_device_create_file()
        drivers/pcmcia/electra_cf.c: add missing iounmap and kfree
        pcmcia: replace open-coded ARRAY_SIZE with macro
      a394c6a0
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · d8133356
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
       "PCI changes for the v4.2 merge window:
      
        Enumeration
          - Move pci_ari_enabled() to global header (Alex Williamson)
          - Account for ARI in _PRT lookups (Alex Williamson)
          - Remove unused pci_scan_bus_parented() (Yijing Wang)
      
        Resource management
          - Use host bridge _CRS info on systems with >32 bit addressing (Bjorn Helgaas)
          - Use host bridge _CRS info on Foxconn K8M890-8237A (Bjorn Helgaas)
          - Fix pci_address_to_pio() conversion of CPU address to I/O port (Zhichang Yuan)
          - Add pci_bus_addr_t (Yinghai Lu)
      
        PCI device hotplug
          - Wait for pciehp command completion where necessary (Alex Williamson)
          - Drop pointless ACPI-based "slot detection" check (Rafael J. Wysocki)
          - Check ignore_hotplug for all downstream devices (Rafael J. Wysocki)
          - Propagate the "ignore hotplug" setting to parent (Rafael J. Wysocki)
          - Inline pciehp "handle event" functions into the ISR (Bjorn Helgaas)
          - Clean up pciehp debug logging (Bjorn Helgaas)
      
        Power management
          - Remove redundant PCIe port type checking (Yijing Wang)
          - Add dev->has_secondary_link to track downstream PCIe links (Yijing Wang)
          - Use dev->has_secondary_link to find downstream links for ASPM (Yijing Wang)
          - Drop __pci_disable_link_state() useless "force" parameter (Bjorn Helgaas)
          - Simplify Clock Power Management setting (Bjorn Helgaas)
      
        Virtualization
          - Add ACS quirks for Intel 9-series PCH root ports (Alex Williamson)
          - Add function 1 DMA alias quirk for Marvell 9120 (Sakari Ailus)
      
        MSI
          - Disable MSI at enumeration even if kernel doesn't support MSI (Michael S. Tsirkin)
          - Remove unused pci_msi_off() (Bjorn Helgaas)
          - Rename msi_set_enable(), msix_clear_and_set_ctrl() (Michael S.  Tsirkin)
          - Export pci_msi_set_enable(), pci_msix_clear_and_set_ctrl() (Michael S. Tsirkin)
          - Drop pci_msi_off() calls during probe (Michael S. Tsirkin)
      
        APM X-Gene host bridge driver
          - Add APM X-Gene v1 PCIe MSI/MSIX termination driver (Duc Dang)
          - Add APM X-Gene PCIe MSI DTS nodes (Duc Dang)
          - Disable Configuration Request Retry Status for v1 silicon (Duc Dang)
          - Allow config access to Root Port even when link is down (Duc Dang)
      
        Broadcom iProc host bridge driver
          - Allow override of device tree IRQ mapping function (Hauke Mehrtens)
          - Add BCMA PCIe driver (Hauke Mehrtens)
          - Directly add PCI resources (Hauke Mehrtens)
          - Free resource list after registration (Hauke Mehrtens)
      
        Freescale i.MX6 host bridge driver
          - Add speed change timeout message (Troy Kisky)
          - Rename imx6_pcie_start_link() to imx6_pcie_establish_link() (Bjorn Helgaas)
      
        Freescale Layerscape host bridge driver
          - Use dw_pcie_link_up() consistently (Bjorn Helgaas)
          - Factor out ls_pcie_establish_link() (Bjorn Helgaas)
      
        Marvell MVEBU host bridge driver
          - Remove mvebu_pcie_scan_bus() (Yijing Wang)
      
        NVIDIA Tegra host bridge driver
          - Remove tegra_pcie_scan_bus() (Yijing Wang)
      
        Synopsys DesignWare host bridge driver
          - Consolidate outbound iATU programming functions (Jisheng Zhang)
          - Use iATU0 for cfg and IO, iATU1 for MEM (Jisheng Zhang)
          - Add support for x8 links (Zhou Wang)
          - Wait for link to come up with consistent style (Bjorn Helgaas)
          - Use pci_scan_root_bus() for simplicity (Yijing Wang)
      
        TI DRA7xx host bridge driver
          - Use dw_pcie_link_up() consistently (Bjorn Helgaas)
      
        Miscellaneous
          - Include <linux/pci.h>, not <asm/pci.h> (Bjorn Helgaas)
          - Remove unnecessary #includes of <asm/pci.h> (Bjorn Helgaas)
          - Remove unused pcibios_select_root() (again) (Bjorn Helgaas)
          - Remove unused pci_dma_burst_advice() (Bjorn Helgaas)
          - xen/pcifront: Don't use deprecated function pci_scan_bus_parented() (Arnd Bergmann)"
      
      * tag 'pci-v4.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (58 commits)
        PCI: pciehp: Inline the "handle event" functions into the ISR
        PCI: pciehp: Rename queue_interrupt_event() to pciehp_queue_interrupt_event()
        PCI: pciehp: Make queue_interrupt_event() void
        PCI: xgene: Allow config access to Root Port even when link is down
        PCI: xgene: Disable Configuration Request Retry Status for v1 silicon
        PCI: pciehp: Clean up debug logging
        x86/PCI: Use host bridge _CRS info on systems with >32 bit addressing
        PCI: imx6: Add #define PCIE_RC_LCSR
        PCI: imx6: Use "u32", not "uint32_t"
        PCI: Remove unused pci_scan_bus_parented()
        xen/pcifront: Don't use deprecated function pci_scan_bus_parented()
        PCI: imx6: Add speed change timeout message
        PCI/ASPM: Simplify Clock Power Management setting
        PCI: designware: Wait for link to come up with consistent style
        PCI: layerscape: Factor out ls_pcie_establish_link()
        PCI: layerscape: Use dw_pcie_link_up() consistently
        PCI: dra7xx: Use dw_pcie_link_up() consistently
        x86/PCI: Use host bridge _CRS info on Foxconn K8M890-8237A
        PCI: pciehp: Wait for hotplug command completion where necessary
        PCI: Remove unused pci_dma_burst_advice()
        ...
      d8133356
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus-v4.2' of... · 234a56c8
      Linus Torvalds authored
      Merge tag 'hwmon-for-linus-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon updates from Guenter Roeck:
      
       - new driver for Microchip TC74
      
       - support for ncpXXwf104 added to ntc_thermistor driver
      
       - minor cleanup
      
      * tag 'hwmon-for-linus-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: add driver for Microchip TC74
        hwmon: (ntc_thermistor) Improve precision of resistance calculation
        hwmon: (ntc_thermistor) fix iio raw to microvolts conversion
        hwmon: (atxp1) Drop auto-detection
        hwmon: (atxp1) Drop FSF mailing address
        hwmon: Allow compile test of GPIO consumers if !GPIOLIB
        hwmon: (sht15) Constify platform_device_id
        hwmon: (max197) Constify platform_device_id
        hwmon: (ntc_thermistor) Add support for ncpXXwf104
      234a56c8
    • Linus Torvalds's avatar
      Merge tag 'mmc-v4.2' of git://git.linaro.org/people/ulf.hansson/mmc · a57f14ba
      Linus Torvalds authored
      Pull MMC updates from Ulf Hansson:
       "Here are the changes for MMC for v4.2.
      
        MMC core:
         - Fix an error path in the mmc block layer
         - Fix PM domain attachment for the SDIO bus
         - Add support for driver strength selection
         - Increase a delay to let voltage stabilize
         - Add support for disabling write-protect detection
         - Add facility to support re-tuning
         - Re-tune and retry in the recovery path
         - Add reset option for SDIO
         - Consolidations and clean-ups
      
        MMC host:
         - Add Mediatek MMC driver
         - Constify platform_device_id for a couple of hosts
         - Fix modalias to make module auto-loading work for a couple of hosts
         - sdhci: Add support for sdhci-arasan4.9a
         - sdhci: Fix low memory corruption
         - sdhci: Restore behavior while creating OCR mask
         - sdhci: Add a callback to select drive strength
         - sdhci: Fix driver type B and D handling
         - sdhci: Add support for drive strength selection for SPT
         - sdhci: Enable HS400 for some Intel host controllers
         - sdhci: Convert to use the new re-tuning facility
         - sdhci: Various minor fixes and clean-ups
         - dw_mmc: Add support for hi6220
         - dw_mmc: Use core to handle absent write protect line
         - dw_mmc: Add support to switch voltage
         - tmio: Some fixes and modernizations
         - sh_mmcif: Improve clock rate calculation"
      
      * tag 'mmc-v4.2' of git://git.linaro.org/people/ulf.hansson/mmc: (98 commits)
        mmc: queue: prevent soft lockups on PREEMPT=n
        mmc: mediatek: Add PM support for MMC driver
        mmc: mediatek: Add Mediatek MMC driver
        mmc: dt-bindings: add Mediatek MMC bindings
        mmc: card: Fixup request missing in mmc_blk_issue_rw_rq
        mmc: sdhci: fix low memory corruption
        mmc: sdhci-pci: Change AMD SDHCI quirk application scope
        i2c-piix4: Use Macro for AMD CZ SMBus device ID
        pci_ids: Add AMD KERNCZ device ID support
        mmc: queue: use swap() in mmc_queue_thread()
        mmc: dw_mmc: insmod followed by rmmod will hung for eMMC
        mmc: sdhci: Restore behavior while creating OCR mask
        mmc: sdhci-pxav3: fix device wakeup initialization
        mmc: core: Attach PM domain prior probing of SDIO func driver
        mmc: core: Remove redundant ->power_restore() callback for SD
        mmc: core: Remove redundant ->power_restore() callback for MMC
        mmc: sdhci-bcm2835: Actually enable the clock
        mmc: sdhci-bcm2835: Clean up platform allocations if sdhci init fails.
        mmc: sdhci-of-esdhc: enable interrupt mode to detect card
        mmc: sdhci-esdhc-imx: add quirk SDHCI_QUIRK2_BROKEN_HS200 for imx6qdl
        ...
      a57f14ba
    • Linus Torvalds's avatar
      Merge tag 'gpio-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 10b4b096
      Linus Torvalds authored
      Pull gpio updates from Linus Walleij:
       "This is the big bulk of GPIO changes queued for the v4.2 kernel
        series:
      
         - a big set of cleanups to the aged sysfs interface from Johan
           Hovold.  To get these in, v4.1-rc3 was merged into the tree as the
           first patch in that series had to go into stable.  This makes the
           locking much more fine-grained (get rid of the "big GPIO lock(s)"
           and store states in the GPIO descriptors.
      
         - rename gpiod_[g|s]et_array() to gpiod_[g|s]et_array_value() to
           avoid confusions.
      
         - New drivers for:
            * NXP LPC18xx (currently LPC1850)
            * NetLogic XLP
            * Broadcom STB SoC's
            * Axis ETRAXFS
            * Zynq Ultrascale+ (subdriver)
      
         - ACPI:
            * make it possible to retrieve GpioInt resources from a GPIO
              device using acpi_dev_gpio_irq_get()
            * merge some dependent I2C changes exploiting this.
            * support the ARM X-Gene GPIO standby driver.
      
         - make it possible for the generic GPIO driver to read back the value
           set registers to reflect current status.
      
         - loads of OMAP IRQ handling fixes.
      
         - incremental improvements to Kona, max732x, OMAP, MXC, RCAR,
           PCA953x, STP-XWAY, PCF857x, Crystalcove, TB10x.
      
         - janitorial (constification, checkpatch cleanups)"
      
      * tag 'gpio-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (71 commits)
        gpio: Fix checkpatch.pl issues
        gpio: pcf857x: handle only enabled irqs
        gpio / ACPI: Return -EPROBE_DEFER if the gpiochip was not found
        GPIO / ACPI: export acpi_gpiochip_request(free)_interrupts for module use
        gpio: improve error reporting on own descriptors
        gpio: promote own request failure to pr_err()
        gpio: Added support to Zynq Ultrascale+ MPSoC
        gpio: add ETRAXFS GPIO driver
        fix documentation after renaming gpiod_set_array to gpiod_set_array_value
        gpio: Add GPIO support for Broadcom STB SoCs
        gpio: xgene: add ACPI support for APM X-Gene GPIO standby driver
        gpio: tb10x: Drop unneeded free_irq() call
        gpio: crystalcove: set IRQCHIP_SKIP_SET_WAKE for the irqchip
        gpio: stp-xway: Use the of_property_read_u32 helper
        gpio: pcf857x: Check for irq_set_irq_wake() failures
        gpio-stp-xway: Fix enabling the highest bit of the PHY LEDs
        gpio: Prevent an integer overflow in the pca953x driver
        gpio: omap: rework omap_gpio_irq_startup to handle current pin state properly
        gpio: omap: rework omap_gpio_request to touch only gpio specific registers
        gpio: omap: rework omap_x_irq_shutdown to touch only irqs specific registers
        ...
      10b4b096
    • Linus Torvalds's avatar
      Merge tag 'pwm/for-4.2-rc1' of... · c70c5fb2
      Linus Torvalds authored
      Merge tag 'pwm/for-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "This has a couple of fixes for Atmel, Samsung and Broadcom drivers.
      
        Some preparatory patches for more upcoming Intel work is included as
        well"
      
      * tag 'pwm/for-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: lpss: pci: Add support for Broxton platform
        pwm: bcm-kona: Don't set polarity in probe
        pwm: Add pwmchip_add_with_polarity() API
        pwm: atmel: Fix incorrect CDTY value after disabling
        pwm: atmel: Fix incorrect CDTY value after enabling
        pwm: samsung: Use MODULE_DEVICE_TABLE() to include OF modalias
        pwm: Add support to remove registered consumer lookup tables
      c70c5fb2
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 44d21c3f
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       "Here is the crypto update for 4.2:
      
        API:
      
         - Convert RNG interface to new style.
      
         - New AEAD interface with one SG list for AD and plain/cipher text.
           All external AEAD users have been converted.
      
         - New asymmetric key interface (akcipher).
      
        Algorithms:
      
         - Chacha20, Poly1305 and RFC7539 support.
      
         - New RSA implementation.
      
         - Jitter RNG.
      
         - DRBG is now seeded with both /dev/random and Jitter RNG.  If kernel
           pool isn't ready then DRBG will be reseeded when it is.
      
         - DRBG is now the default crypto API RNG, replacing krng.
      
         - 842 compression (previously part of powerpc nx driver).
      
        Drivers:
      
         - Accelerated SHA-512 for arm64.
      
         - New Marvell CESA driver that supports DMA and more algorithms.
      
         - Updated powerpc nx 842 support.
      
         - Added support for SEC1 hardware to talitos"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (292 commits)
        crypto: marvell/cesa - remove COMPILE_TEST dependency
        crypto: algif_aead - Temporarily disable all AEAD algorithms
        crypto: af_alg - Forbid the use internal algorithms
        crypto: echainiv - Only hold RNG during initialisation
        crypto: seqiv - Add compatibility support without RNG
        crypto: eseqiv - Offer normal cipher functionality without RNG
        crypto: chainiv - Offer normal cipher functionality without RNG
        crypto: user - Add CRYPTO_MSG_DELRNG
        crypto: user - Move cryptouser.h to uapi
        crypto: rng - Do not free default RNG when it becomes unused
        crypto: skcipher - Allow givencrypt to be NULL
        crypto: sahara - propagate the error on clk_disable_unprepare() failure
        crypto: rsa - fix invalid select for AKCIPHER
        crypto: picoxcell - Update to the current clk API
        crypto: nx - Check for bogus firmware properties
        crypto: marvell/cesa - add DT bindings documentation
        crypto: marvell/cesa - add support for Kirkwood and Dove SoCs
        crypto: marvell/cesa - add support for Orion SoCs
        crypto: marvell/cesa - add allhwsupport module parameter
        crypto: marvell/cesa - add support for all armada SoCs
        ...
      44d21c3f
    • Linus Torvalds's avatar
      Merge tag 'please-pull-paravirt' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · efdfce2b
      Linus Torvalds authored
      Pull ia64 paravirt removal from Tony Luck:
       "Nobody cares about paravirtualization on ia64 anymore"
      
      * tag 'please-pull-paravirt' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        ia64: remove paravirt code
      efdfce2b
    • Linus Torvalds's avatar
      Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · df687709
      Linus Torvalds authored
      Pull m68k update from Geert Uytterhoeven.
      
      * 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Use for_each_sg()
        m68k/defconfig: Update defconfigs for v4.1-rc6
      df687709
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 407a2c72
      Linus Torvalds authored
      Pull irq updates from Thomas Gleixner:
       "The irq departement delivers:
      
         - plug a potential race related to chained interrupt handlers
      
         - core updates which address the needs of the x86 irqdomain conversion
      
         - new irqchip callback to support affinity settings for VCPUs
      
         - the usual pile of updates to interrupt chip drivers
      
         - a few helper functions to allow further cleanups and
           simplifications
      
        I have a largish pile of coccinelle scripted/verified cleanups and
        simplifications pending on top of that, but I prefer to send that
        towards the end of the merge window when the arch/driver changes have
        hit your tree to avoid API change wreckage as far as possible"
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (34 commits)
        genirq: Remove bogus restriction in irq_move_mask_irq()
        irqchip: atmel-aic5: Add sama5d2 support
        irq: spear-shirq: Fix race in installing chained IRQ handler
        irq: irq-keystone: Fix race in installing chained IRQ handler
        gpio: gpio-tegra: Fix race in installing chained IRQ handler
        gpio: gpio-mxs: Fix race in installing chained IRQ handler
        gpio: gpio-mxc: Fix race in installing chained IRQ handler
        ARM: gemini: Fix race in installing GPIO chained IRQ handler
        GPU: ipu: Fix race in installing IPU chained IRQ handler
        ARM: sa1100: convert SA11x0 related code to use new chained handler helper
        irq: Add irq_set_chained_handler_and_data()
        irqchip: exynos-combiner: Save IRQ enable set on suspend
        genirq: Introduce helper function irq_data_get_affinity_mask()
        genirq: Introduce helper function irq_data_get_node()
        genirq: Introduce struct irq_common_data to host shared irq data
        genirq: Prevent crash in irq_move_irq()
        genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain
        irqchip: gic: Simplify gic_configure_irq by using IRQCHIP_SET_TYPE_MASKED
        irqchip: renesas: intc-irqpin: Improve binding documentation
        genirq: Set IRQCHIP_SKIP_SET_WAKE for no_irq_chip
        ...
      407a2c72
    • Linus Torvalds's avatar
      Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3a95398f
      Linus Torvalds authored
      Pull NOHZ updates from Thomas Gleixner:
       "A few updates to the nohz infrastructure:
      
         - recursion protection for context tracking
      
         - make the TIF_NOHZ inheritance smarter
      
         - isolate cpus which belong to the NOHZ full set"
      
      * 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        nohz: Set isolcpus when nohz_full is set
        nohz: Add tick_nohz_full_add_cpus_to() API
        context_tracking: Inherit TIF_NOHZ through forks instead of context switches
        context_tracking: Protect against recursion
      3a95398f
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 43224b96
      Linus Torvalds authored
      Pull timer updates from Thomas Gleixner:
       "A rather largish update for everything time and timer related:
      
         - Cache footprint optimizations for both hrtimers and timer wheel
      
         - Lower the NOHZ impact on systems which have NOHZ or timer migration
           disabled at runtime.
      
         - Optimize run time overhead of hrtimer interrupt by making the clock
           offset updates smarter
      
         - hrtimer cleanups and removal of restrictions to tackle some
           problems in sched/perf
      
         - Some more leap second tweaks
      
         - Another round of changes addressing the 2038 problem
      
         - First step to change the internals of clock event devices by
           introducing the necessary infrastructure
      
         - Allow constant folding for usecs/msecs_to_jiffies()
      
         - The usual pile of clockevent/clocksource driver updates
      
        The hrtimer changes contain updates to sched, perf and x86 as they
        depend on them plus changes all over the tree to cleanup API changes
        and redundant code, which got copied all over the place.  The y2038
        changes touch s390 to remove the last non 2038 safe code related to
        boot/persistant clock"
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (114 commits)
        clocksource: Increase dependencies of timer-stm32 to limit build wreckage
        timer: Minimize nohz off overhead
        timer: Reduce timer migration overhead if disabled
        timer: Stats: Simplify the flags handling
        timer: Replace timer base by a cpu index
        timer: Use hlist for the timer wheel hash buckets
        timer: Remove FIFO "guarantee"
        timers: Sanitize catchup_timer_jiffies() usage
        hrtimer: Allow hrtimer::function() to free the timer
        seqcount: Introduce raw_write_seqcount_barrier()
        seqcount: Rename write_seqcount_barrier()
        hrtimer: Fix hrtimer_is_queued() hole
        hrtimer: Remove HRTIMER_STATE_MIGRATE
        selftest: Timers: Avoid signal deadlock in leap-a-day
        timekeeping: Copy the shadow-timekeeper over the real timekeeper last
        clockevents: Check state instead of mode in suspend/resume path
        selftests: timers: Add leap-second timer edge testing to leap-a-day.c
        ntp: Do leapsecond adjustment in adjtimex read path
        time: Prevent early expiry of hrtimers[CLOCK_REALTIME] at the leap second edge
        ntp: Introduce and use SECS_PER_DAY macro instead of 86400
        ...
      43224b96
    • Linus Torvalds's avatar
      Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d70b3ef5
      Linus Torvalds authored
      Pull x86 core updates from Ingo Molnar:
       "There were so many changes in the x86/asm, x86/apic and x86/mm topics
        in this cycle that the topical separation of -tip broke down somewhat -
        so the result is a more traditional architecture pull request,
        collected into the 'x86/core' topic.
      
        The topics were still maintained separately as far as possible, so
        bisectability and conceptual separation should still be pretty good -
        but there were a handful of merge points to avoid excessive
        dependencies (and conflicts) that would have been poorly tested in the
        end.
      
        The next cycle will hopefully be much more quiet (or at least will
        have fewer dependencies).
      
        The main changes in this cycle were:
      
         * x86/apic changes, with related IRQ core changes: (Jiang Liu, Thomas
           Gleixner)
      
           - This is the second and most intrusive part of changes to the x86
             interrupt handling - full conversion to hierarchical interrupt
             domains:
      
                [IOAPIC domain]   -----
                                       |
                [MSI domain]      --------[Remapping domain] ----- [ Vector domain ]
                                       |   (optional)          |
                [HPET MSI domain] -----                        |
                                                               |
                [DMAR domain]     -----------------------------
                                                               |
                [Legacy domain]   -----------------------------
      
             This now reflects the actual hardware and allowed us to distangle
             the domain specific code from the underlying parent domain, which
             can be optional in the case of interrupt remapping.  It's a clear
             separation of functionality and removes quite some duct tape
             constructs which plugged the remap code between ioapic/msi/hpet
             and the vector management.
      
           - Intel IOMMU IRQ remapping enhancements, to allow direct interrupt
             injection into guests (Feng Wu)
      
         * x86/asm changes:
      
           - Tons of cleanups and small speedups, micro-optimizations.  This
             is in preparation to move a good chunk of the low level entry
             code from assembly to C code (Denys Vlasenko, Andy Lutomirski,
             Brian Gerst)
      
           - Moved all system entry related code to a new home under
             arch/x86/entry/ (Ingo Molnar)
      
           - Removal of the fragile and ugly CFI dwarf debuginfo annotations.
             Conversion to C will reintroduce many of them - but meanwhile
             they are only getting in the way, and the upstream kernel does
             not rely on them (Ingo Molnar)
      
           - NOP handling refinements. (Borislav Petkov)
      
         * x86/mm changes:
      
           - Big PAT and MTRR rework: making the code more robust and
             preparing to phase out exposing direct MTRR interfaces to drivers -
             in favor of using PAT driven interfaces (Toshi Kani, Luis R
             Rodriguez, Borislav Petkov)
      
           - New ioremap_wt()/set_memory_wt() interfaces to support
             Write-Through cached memory mappings.  This is especially
             important for good performance on NVDIMM hardware (Toshi Kani)
      
         * x86/ras changes:
      
           - Add support for deferred errors on AMD (Aravind Gopalakrishnan)
      
             This is an important RAS feature which adds hardware support for
             poisoned data.  That means roughly that the hardware marks data
             which it has detected as corrupted but wasn't able to correct, as
             poisoned data and raises an APIC interrupt to signal that in the
             form of a deferred error.  It is the OS's responsibility then to
             take proper recovery action and thus prolonge system lifetime as
             far as possible.
      
           - Add support for Intel "Local MCE"s: upcoming CPUs will support
             CPU-local MCE interrupts, as opposed to the traditional system-
             wide broadcasted MCE interrupts (Ashok Raj)
      
           - Misc cleanups (Borislav Petkov)
      
         * x86/platform changes:
      
           - Intel Atom SoC updates
      
        ... and lots of other cleanups, fixlets and other changes - see the
        shortlog and the Git log for details"
      
      * 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (222 commits)
        x86/hpet: Use proper hpet device number for MSI allocation
        x86/hpet: Check for irq==0 when allocating hpet MSI interrupts
        x86/mm/pat, drivers/infiniband/ipath: Use arch_phys_wc_add() and require PAT disabled
        x86/mm/pat, drivers/media/ivtv: Use arch_phys_wc_add() and require PAT disabled
        x86/platform/intel/baytrail: Add comments about why we disabled HPET on Baytrail
        genirq: Prevent crash in irq_move_irq()
        genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain
        iommu, x86: Properly handle posted interrupts for IOMMU hotplug
        iommu, x86: Provide irq_remapping_cap() interface
        iommu, x86: Setup Posted-Interrupts capability for Intel iommu
        iommu, x86: Add cap_pi_support() to detect VT-d PI capability
        iommu, x86: Avoid migrating VT-d posted interrupts
        iommu, x86: Save the mode (posted or remapped) of an IRTE
        iommu, x86: Implement irq_set_vcpu_affinity for intel_ir_chip
        iommu: dmar: Provide helper to copy shared irte fields
        iommu: dmar: Extend struct irte for VT-d Posted-Interrupts
        iommu: Add new member capability to struct irq_remap_ops
        x86/asm/entry/64: Disentangle error_entry/exit gsbase/ebx/usermode code
        x86/asm/entry/32: Shorten __audit_syscall_entry() args preparation
        x86/asm/entry/32: Explain reloading of registers after __audit_syscall_entry()
        ...
      d70b3ef5
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 650ec5a6
      Linus Torvalds authored
      Pull x86 warning fixlet from Ingo Molnar:
       "A build fix for certain (rare) variants of binutils that did not make
        it into v4.1"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/boot: Fix overflow warning with 32-bit binutils
      650ec5a6
    • Linus Torvalds's avatar
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 35ffccdb
      Linus Torvalds authored
      Pul x86 microcode updates from Ingo Molnar:
       "x86 microcode loader updates from Borislav Petkov:
      
         - early parsing of the built-in microcode
      
         - cleanups
      
         - misc smaller fixes"
      
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/microcode: Correct CPU family related variable types
        x86/microcode: Disable builtin microcode loading on 32-bit for now
        x86/microcode/intel: Rename get_matching_sig()
        x86/microcode/intel: Simplify get_matching_sig()
        x86/microcode/intel: Simplify update_match_cpu()
        x86/microcode/intel: Rename get_matching_microcode
        x86/cpu/microcode: Zap changelog
        x86/microcode: Parse built-in microcode early
        x86/microcode/intel: Remove unused @rev arg of get_matching_sig()
        x86/microcode/intel: Get rid of revision_is_newer()
      35ffccdb
    • Linus Torvalds's avatar
      Merge branch 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e2172d8f
      Linus Torvalds authored
      Pull x86 kdump updates from Ingo Molnar:
       "Three kdump robustness related improvements (Joerg Roedel)"
      
      * 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/crash: Allocate enough low memory when crashkernel=high
        x86/swiotlb: Try coherent allocations with __GFP_NOWARN
        swiotlb: Warn on allocation failure in swiotlb_alloc_coherent()
      e2172d8f
    • Linus Torvalds's avatar
      Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e75c73ad
      Linus Torvalds authored
      Pull x86 FPU updates from Ingo Molnar:
       "This tree contains two main changes:
      
         - The big FPU code rewrite: wide reaching cleanups and reorganization
           that pulls all the FPU code together into a clean base in
           arch/x86/fpu/.
      
           The resulting code is leaner and faster, and much easier to
           understand.  This enables future work to further simplify the FPU
           code (such as removing lazy FPU restores).
      
           By its nature these changes have a substantial regression risk: FPU
           code related bugs are long lived, because races are often subtle
           and bugs mask as user-space failures that are difficult to track
           back to kernel side backs.  I'm aware of no unfixed (or even
           suspected) FPU related regression so far.
      
         - MPX support rework/fixes.  As this is still not a released CPU
           feature, there were some buglets in the code - should be much more
           robust now (Dave Hansen)"
      
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (250 commits)
        x86/fpu: Fix double-increment in setup_xstate_features()
        x86/mpx: Allow 32-bit binaries on 64-bit kernels again
        x86/mpx: Do not count MPX VMAs as neighbors when unmapping
        x86/mpx: Rewrite the unmap code
        x86/mpx: Support 32-bit binaries on 64-bit kernels
        x86/mpx: Use 32-bit-only cmpxchg() for 32-bit apps
        x86/mpx: Introduce new 'directory entry' to 'addr' helper function
        x86/mpx: Add temporary variable to reduce masking
        x86: Make is_64bit_mm() widely available
        x86/mpx: Trace allocation of new bounds tables
        x86/mpx: Trace the attempts to find bounds tables
        x86/mpx: Trace entry to bounds exception paths
        x86/mpx: Trace #BR exceptions
        x86/mpx: Introduce a boot-time disable flag
        x86/mpx: Restrict the mmap() size check to bounds tables
        x86/mpx: Remove redundant MPX_BNDCFG_ADDR_MASK
        x86/mpx: Clean up the code by not passing a task pointer around when unnecessary
        x86/mpx: Use the new get_xsave_field_ptr()API
        x86/fpu/xstate: Wrap get_xsave_addr() to make it safer
        x86/fpu/xstate: Fix up bad get_xsave_addr() assumptions
        ...
      e75c73ad
    • Linus Torvalds's avatar
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · cfe3eceb
      Linus Torvalds authored
      Pull x86 EFI updates from Ingo Molnar:
       "EFI changes:
      
         - Use idiomatic negative error values in efivar_create_sysfs_entry()
           instead of returning '1' to indicate error (Dan Carpenter)
      
         - Implement new support to expose the EFI System Resource Tables in
           sysfs, which provides information for performing firmware updates
           (Peter Jones)
      
         - Documentation cleanup in the EFI handover protocol section which
           falsely claimed that 'cmdline_size' needed to be filled out by the
           boot loader (Alex Smith)
      
         - Align the order of SMBIOS tables in /sys/firmware/efi/systab to
           match the way that we do things for ACPI and add documentation to
           Documentation/ABI (Jean Delvare)"
      
      * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        efi: Work around ia64 build problem with ESRT driver
        efi: Add 'systab' information to Documentation/ABI
        efi: dmi: List SMBIOS3 table before SMBIOS table
        efi/esrt: Fix some compiler warnings
        x86, doc: Remove cmdline_size from list of fields to be filled in for EFI handover
        efi: Add esrt support
        efi: efivar_create_sysfs_entry() should return negative error codes
      cfe3eceb
    • Linus Torvalds's avatar
      Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5ef6ca4f
      Linus Torvalds authored
      Pull x86 debugging documentation updates from Ingo Molnar:
       "Documentation updates about x86 kernel stacks"
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/Documentation: Adapt Ingo's explanation on printing backtraces
        x86/Documentation: Remove STACKFAULT_STACK bulletpoint
        x86/Documentation: Move kernel-stacks doc one level up
      5ef6ca4f
  8. 22 Jun, 2015 11 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b3ba283d
      Linus Torvalds authored
      Pull x86 CPU features from Ingo Molnar:
       "Various CPU feature support related changes: in particular the
        /proc/cpuinfo model name sanitization change should be monitored, it
        has a chance to break stuff.  (but really shouldn't and there are no
        regression reports)"
      
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/cpu/amd: Give access to the number of nodes in a physical package
        x86/cpu: Trim model ID whitespace
        x86/cpu: Strip any /proc/cpuinfo model name field whitespace
        x86/cpu/amd: Set X86_FEATURE_EXTD_APICID for future processors
        x86/gart: Check for GART support before accessing GART registers
      b3ba283d
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d43e4f44
      Linus Torvalds authored
      Pull x86 cleanups from Ingo Molnar:
       "Misc cleanups"
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm: Clean up types in xlate_dev_mem_ptr() some more
        x86: Deinline dma_free_attrs()
        x86: Deinline dma_alloc_attrs()
        x86: Remove unused TI_cpu
        x86: Merge common 32-bit values in asm-offsets.c
      d43e4f44
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 23b77762
      Linus Torvalds authored
      Pull scheduler updates from Ingo Molnar:
       "The main changes are:
      
         - lockless wakeup support for futexes and IPC message queues
           (Davidlohr Bueso, Peter Zijlstra)
      
         - Replace spinlocks with atomics in thread_group_cputimer(), to
           improve scalability (Jason Low)
      
         - NUMA balancing improvements (Rik van Riel)
      
         - SCHED_DEADLINE improvements (Wanpeng Li)
      
         - clean up and reorganize preemption helpers (Frederic Weisbecker)
      
         - decouple page fault disabling machinery from the preemption
           counter, to improve debuggability and robustness (David
           Hildenbrand)
      
         - SCHED_DEADLINE documentation updates (Luca Abeni)
      
         - topology CPU masks cleanups (Bartosz Golaszewski)
      
         - /proc/sched_debug improvements (Srikar Dronamraju)"
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (79 commits)
        sched/deadline: Remove needless parameter in dl_runtime_exceeded()
        sched: Remove superfluous resetting of the p->dl_throttled flag
        sched/deadline: Drop duplicate init_sched_dl_class() declaration
        sched/deadline: Reduce rq lock contention by eliminating locking of non-feasible target
        sched/deadline: Make init_sched_dl_class() __init
        sched/deadline: Optimize pull_dl_task()
        sched/preempt: Add static_key() to preempt_notifiers
        sched/preempt: Fix preempt notifiers documentation about hlist_del() within unsafe iteration
        sched/stop_machine: Fix deadlock between multiple stop_two_cpus()
        sched/debug: Add sum_sleep_runtime to /proc/<pid>/sched
        sched/debug: Replace vruntime with wait_sum in /proc/sched_debug
        sched/debug: Properly format runnable tasks in /proc/sched_debug
        sched/numa: Only consider less busy nodes as numa balancing destinations
        Revert 095bebf6 ("sched/numa: Do not move past the balance point if unbalanced")
        sched/fair: Prevent throttling in early pick_next_task_fair()
        preempt: Reorganize the notrace definitions a bit
        preempt: Use preempt_schedule_context() as the official tracing preemption point
        sched: Make preempt_schedule_context() function-tracing safe
        x86: Remove cpu_sibling_mask() and cpu_core_mask()
        x86: Replace cpu_**_mask() with topology_**_cpumask()
        ...
      23b77762
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6bc4c3ad
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "These are the left over fixes from the v4.1 cycle"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf tools: Fix build breakage if prefix= is specified
        perf/x86: Honor the architectural performance monitoring version
        perf/x86/intel: Fix PMI handling for Intel PT
        perf/x86/intel/bts: Fix DS area sharing with x86_pmu events
        perf/x86: Add more Broadwell model numbers
        perf: Fix ring_buffer_attach() RCU sync, again
      6bc4c3ad
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c58267e9
      Linus Torvalds authored
      Pull perf updates from Ingo Molnar:
       "Kernel side changes mostly consist of work on x86 PMU drivers:
      
         - x86 Intel PT (hardware CPU tracer) improvements (Alexander
           Shishkin)
      
         - x86 Intel CQM (cache quality monitoring) improvements (Thomas
           Gleixner)
      
         - x86 Intel PEBSv3 support (Peter Zijlstra)
      
         - x86 Intel PEBS interrupt batching support for lower overhead
           sampling (Zheng Yan, Kan Liang)
      
         - x86 PMU scheduler fixes and improvements (Peter Zijlstra)
      
        There's too many tooling improvements to list them all - here are a
        few select highlights:
      
        'perf bench':
      
            - Introduce new 'perf bench futex' benchmark: 'wake-parallel', to
              measure parallel waker threads generating contention for kernel
              locks (hb->lock). (Davidlohr Bueso)
      
        'perf top', 'perf report':
      
            - Allow disabling/enabling events dynamicaly in 'perf top':
              a 'perf top' session can instantly become a 'perf report'
              one, i.e. going from dynamic analysis to a static one,
              returning to a dynamic one is possible, to toogle the
              modes, just press 'f' to 'freeze/unfreeze' the sampling. (Arnaldo Carvalho de Melo)
      
            - Make Ctrl-C stop processing on TUI, allowing interrupting the load of big
              perf.data files (Namhyung Kim)
      
        'perf probe': (Masami Hiramatsu)
      
            - Support glob wildcards for function name
            - Support $params special probe argument: Collect all function arguments
            - Make --line checks validate C-style function name.
            - Add --no-inlines option to avoid searching inline functions
            - Greatly speed up 'perf probe --list' by caching debuginfo.
            - Improve --filter support for 'perf probe', allowing using its arguments
              on other commands, as --add, --del, etc.
      
        'perf sched':
      
            - Add option in 'perf sched' to merge like comms to lat output (Josef Bacik)
      
        Plus tons of infrastructure work - in particular preparation for
        upcoming threaded perf report support, but also lots of other work -
        and fixes and other improvements.  See (much) more details in the
        shortlog and in the git log"
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (305 commits)
        perf tools: Configurable per thread proc map processing time out
        perf tools: Add time out to force stop proc map processing
        perf report: Fix sort__sym_cmp to also compare end of symbol
        perf hists browser: React to unassigned hotkey pressing
        perf top: Tell the user how to unfreeze events after pressing 'f'
        perf hists browser: Honour the help line provided by builtin-{top,report}.c
        perf hists browser: Do not exit when 'f' is pressed in 'report' mode
        perf top: Replace CTRL+z with 'f' as hotkey for enable/disable events
        perf annotate: Rename source_line_percent to source_line_samples
        perf annotate: Display total number of samples with --show-total-period
        perf tools: Ensure thread-stack is flushed
        perf top: Allow disabling/enabling events dynamicly
        perf evlist: Add toggle_enable() method
        perf trace: Fix race condition at the end of started workloads
        perf probe: Speed up perf probe --list by caching debuginfo
        perf probe: Show usage even if the last event is skipped
        perf tools: Move libtraceevent dynamic list to separated LDFLAGS variable
        perf tools: Fix a problem when opening old perf.data with different byte order
        perf tools: Ignore .config-detected in .gitignore
        perf probe: Fix to return error if no probe is added
        ...
      c58267e9
    • Linus Torvalds's avatar
      Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1bf7067c
      Linus Torvalds authored
      Pull locking updates from Ingo Molnar:
       "The main changes are:
      
         - 'qspinlock' support, enabled on x86: queued spinlocks - these are
           now the spinlock variant used by x86 as they outperform ticket
           spinlocks in every category.  (Waiman Long)
      
         - 'pvqspinlock' support on x86: paravirtualized variant of queued
           spinlocks.  (Waiman Long, Peter Zijlstra)
      
         - 'qrwlock' support, enabled on x86: queued rwlocks.  Similar to
           queued spinlocks, they are now the variant used by x86:
      
             CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
             CONFIG_QUEUED_SPINLOCKS=y
             CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
             CONFIG_QUEUED_RWLOCKS=y
      
         - various lockdep fixlets
      
         - various locking primitives cleanups, further WRITE_ONCE()
           propagation"
      
      * 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
        locking/lockdep: Remove hard coded array size dependency
        locking/qrwlock: Don't contend with readers when setting _QW_WAITING
        lockdep: Do not break user-visible string
        locking/arch: Rename set_mb() to smp_store_mb()
        locking/arch: Add WRITE_ONCE() to set_mb()
        rtmutex: Warn if trylock is called from hard/softirq context
        arch: Remove __ARCH_HAVE_CMPXCHG
        locking/rtmutex: Drop usage of __HAVE_ARCH_CMPXCHG
        locking/qrwlock: Rename QUEUE_RWLOCK to QUEUED_RWLOCKS
        locking/pvqspinlock: Rename QUEUED_SPINLOCK to QUEUED_SPINLOCKS
        locking/pvqspinlock: Replace xchg() by the more descriptive set_mb()
        locking/pvqspinlock, x86: Enable PV qspinlock for Xen
        locking/pvqspinlock, x86: Enable PV qspinlock for KVM
        locking/pvqspinlock, x86: Implement the paravirt qspinlock call patching
        locking/pvqspinlock: Implement simple paravirt support for the qspinlock
        locking/qspinlock: Revert to test-and-set on hypervisors
        locking/qspinlock: Use a simple write to grab the lock
        locking/qspinlock: Optimize for smaller NR_CPUS
        locking/qspinlock: Extract out code snippets for the next patch
        locking/qspinlock: Add pending bit
        ...
      1bf7067c
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · fc934d40
      Linus Torvalds authored
      Pull RCU updates from Ingo Molnar:
      
       - Continued initialization/Kconfig updates: hide most Kconfig options
         from unsuspecting users.
      
         There's now a single high level configuration option:
      
              *
              * RCU Subsystem
              *
              Make expert-level adjustments to RCU configuration (RCU_EXPERT) [N/y/?] (NEW)
      
         Which if answered in the negative, leaves us with a single
         interactive configuration option:
      
              Offload RCU callback processing from boot-selected CPUs (RCU_NOCB_CPU) [N/y/?] (NEW)
      
         All the rest of the RCU options are configured automatically.  Later
         on we'll remove this single leftover configuration option as well.
      
       - Remove all uses of RCU-protected array indexes: replace the
         rcu_[access|dereference]_index_check() APIs with READ_ONCE() and
         rcu_lockdep_assert()
      
       - RCU CPU-hotplug cleanups
      
       - Updates to Tiny RCU: a race fix and further code shrinkage.
      
       - RCU torture-testing updates: fixes, speedups, cleanups and
         documentation updates.
      
       - Miscellaneous fixes
      
       - Documentation updates
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (60 commits)
        rcutorture: Allow repetition factors in Kconfig-fragment lists
        rcutorture: Display "make oldconfig" errors
        rcutorture: Update TREE_RCU-kconfig.txt
        rcutorture: Make rcutorture scripts force RCU_EXPERT
        rcutorture: Update configuration fragments for rcutree.rcu_fanout_exact
        rcutorture: TASKS_RCU set directly, so don't explicitly set it
        rcutorture: Test SRCU cleanup code path
        rcutorture: Replace barriers with smp_store_release() and smp_load_acquire()
        locktorture: Change longdelay_us to longdelay_ms
        rcutorture: Allow negative values of nreaders to oversubscribe
        rcutorture: Exchange TREE03 and TREE08 NR_CPUS, speed up CPU hotplug
        rcutorture: Exchange TREE03 and TREE04 geometries
        locktorture: fix deadlock in 'rw_lock_irq' type
        rcu: Correctly handle non-empty Tiny RCU callback list with none ready
        rcutorture: Test both RCU-sched and RCU-bh for Tiny RCU
        rcu: Further shrink Tiny RCU by making empty functions static inlines
        rcu: Conditionally compile RCU's eqs warnings
        rcu: Remove prompt for RCU implementation
        rcu: Make RCU able to tolerate undefined CONFIG_RCU_KTHREAD_PRIO
        rcu: Make RCU able to tolerate undefined CONFIG_RCU_FANOUT_LEAF
        ...
      fc934d40
    • Linus Torvalds's avatar
      Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 052b398a
      Linus Torvalds authored
      Pull vfs updates from Al Viro:
       "In this pile: pathname resolution rewrite.
      
         - recursion in link_path_walk() is gone.
      
         - nesting limits on symlinks are gone (the only limit remaining is
           that the total amount of symlinks is no more than 40, no matter how
           nested).
      
         - "fast" (inline) symlinks are handled without leaving rcuwalk mode.
      
         - stack footprint (independent of the nesting) is below kilobyte now,
           about on par with what it used to be with one level of nested
           symlinks and ~2.8 times lower than it used to be in the worst case.
      
         - struct nameidata is entirely private to fs/namei.c now (not even
           opaque pointers are being passed around).
      
         - ->follow_link() and ->put_link() calling conventions had been
           changed; all in-tree filesystems converted, out-of-tree should be
           able to follow reasonably easily.
      
           For out-of-tree conversions, see Documentation/filesystems/porting
           for details (and in-tree filesystems for examples of conversion).
      
        That has sat in -next since mid-May, seems to survive all testing
        without regressions and merges clean with v4.1"
      
      * 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (131 commits)
        turn user_{path_at,path,lpath,path_dir}() into static inlines
        namei: move saved_nd pointer into struct nameidata
        inline user_path_create()
        inline user_path_parent()
        namei: trim do_last() arguments
        namei: stash dfd and name into nameidata
        namei: fold path_cleanup() into terminate_walk()
        namei: saner calling conventions for filename_parentat()
        namei: saner calling conventions for filename_create()
        namei: shift nameidata down into filename_parentat()
        namei: make filename_lookup() reject ERR_PTR() passed as name
        namei: shift nameidata inside filename_lookup()
        namei: move putname() call into filename_lookup()
        namei: pass the struct path to store the result down into path_lookupat()
        namei: uninline set_root{,_rcu}()
        namei: be careful with mountpoint crossings in follow_dotdot_rcu()
        Documentation: remove outdated information from automount-support.txt
        get rid of assorted nameidata-related debris
        lustre: kill unused helper
        lustre: kill unused macro (LOOKUP_CONTINUE)
        ...
      052b398a
    • Jiri Kosina's avatar
      Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics',... · ec3b34e1
      Jiri Kosina authored
      Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus
      
      Conflicts:
      	drivers/hid/wacom_wac.c
      ec3b34e1
    • Jiri Kosina's avatar
      Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech' into for-linus · 817a3125
      Jiri Kosina authored
      Conflicts:
      	drivers/hid/hid-logitech-hidpp.c
      817a3125
    • Boris Brezillon's avatar
      crypto: marvell/cesa - remove COMPILE_TEST dependency · fe55dfdc
      Boris Brezillon authored
      The CESA driver calls phys_to_virt() which is not available on all
      architectures.
      Remove the depency on COMPILE_TEST to prevent building this driver on
      non ARM architectures.
      Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
      Reported-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Suggested-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      fe55dfdc