1. 16 Mar, 2020 2 commits
  2. 11 Mar, 2020 2 commits
  3. 18 Feb, 2020 3 commits
  4. 14 Feb, 2020 1 commit
  5. 12 Feb, 2020 5 commits
  6. 03 Feb, 2020 1 commit
    • Hans de Goede's avatar
      HID: ite: Only bind to keyboard USB interface on Acer SW5-012 keyboard dock · beae5619
      Hans de Goede authored
      Commit 8f18eca9 ("HID: ite: Add USB id match for Acer SW5-012 keyboard
      dock") added the USB id for the Acer SW5-012's keyboard dock to the
      hid-ite driver to fix the rfkill driver not working.
      
      Most keyboard docks with an ITE 8595 keyboard/touchpad controller have the
      "Wireless Radio Control" bits which need the special hid-ite driver on the
      second USB interface (the mouse interface) and their touchpad only supports
      mouse emulation, so using generic hid-input handling for anything but
      the "Wireless Radio Control" bits is fine. On these devices we simply bind
      to all USB interfaces.
      
      But unlike other ITE8595 using keyboard docks, the Acer Aspire Switch 10
      (SW5-012)'s touchpad not only does mouse emulation it also supports
      HID-multitouch and all the keys including the "Wireless Radio Control"
      bits have been moved to the first USB interface (the keyboard intf).
      
      So we need hid-ite to handle the first (keyboard) USB interface and have
      it NOT bind to the second (mouse) USB interface so that that can be
      handled by hid-multitouch.c and we get proper multi-touch support.
      
      This commit changes the hid_device_id for the SW5-012 keyboard dock to
      only match on hid devices from the HID_GROUP_GENERIC group, this way
      hid-ite will not bind the the mouse/multi-touch interface which has
      HID_GROUP_MULTITOUCH_WIN_8 as group.
      This fixes the regression to mouse-emulation mode introduced by adding
      the keyboard dock USB id.
      
      Cc: stable@vger.kernel.org
      Fixes: 8f18eca9 ("HID: ite: Add USB id match for Acer SW5-012 keyboard dock")
      Reported-by: default avatarZdeněk Rampas <zdenda.rampas@gmail.com>
      Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
      Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
      beae5619
  7. 28 Jan, 2020 1 commit
    • Filipe Laíns's avatar
      HID: logitech-hidpp: BatteryVoltage: only read chargeStatus if extPower is active · 4ab2bb3c
      Filipe Laíns authored
      In the HID++ 2.0 function getBatteryInfo() from the BatteryVoltage
      (0x1001) feature, chargeStatus is only valid if extPower is active.
      
      Previously we were ignoring extPower, which resulted in wrong values.
      
      Example:
          With an unplugged mouse
      
          $ cat /sys/class/power_supply/hidpp_battery_0/status
          Charging
      
      This patch fixes that, it also renames charge_sts to flags as
      charge_sts can be confused with chargeStatus from the spec.
      
      Spec:
      +--------+-------------------------------------------------------------------------+
      |  byte  |                                    2                                    |
      +--------+--------------+------------+------------+----------+----------+----------+
      |   bit  |     0..2     |      3     |      4     |     5    |     6    |     7    |
      +--------+--------------+------------+------------+----------+----------+----------+
      | buffer | chargeStatus | fastCharge | slowCharge | critical | (unused) | extPower |
      +--------+--------------+------------+------------+----------+----------+----------+
      Table 1 - battery voltage (0x1001), getBatteryInfo() (ASE 0), 3rd byte
      
      +-------+--------------------------------------+
      | value |                meaning               |
      +-------+--------------------------------------+
      |   0   | Charging                             |
      +-------+--------------------------------------+
      |   1   | End of charge (100% charged)         |
      +-------+--------------------------------------+
      |   2   | Charge stopped (any "normal" reason) |
      +-------+--------------------------------------+
      |   7   | Hardware error                       |
      +-------+--------------------------------------+
      Table 2 - chargeStatus value
      Signed-off-by: default avatarFilipe Laíns <lains@archlinux.org>
      Tested-by: default avatarPedro Vanzella <pedro@pedrovanzella.com>
      Reviewed-by: default avatarPedro Vanzella <pedro@pedrovanzella.com>
      Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
      4ab2bb3c
  8. 27 Jan, 2020 14 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid · 12fb2b99
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       "This time it's surprisingly quiet (probably due to the christmas
        break):
      
         - Logitech HID++ protocol improvements from Mazin Rezk, Pedro
           Vanzella and Adrian Freund
      
         - support for hidraw uniq ioctl from Marcel Holtmann"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
        HID: logitech-hidpp: avoid duplicate error handling code in 'hidpp_probe()'
        hid-logitech-hidpp: read battery voltage from newer devices
        HID: logitech: Add MX Master 3 Mouse
        HID: logitech-hidpp: Support WirelessDeviceStatus connect events
        HID: logitech-hidpp: Support translations from short to long reports
        HID: hidraw: add support uniq ioctl
      12fb2b99
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v5.6-1' of git://git.infradead.org/linux-platform-drivers-x86 · 08c49dc1
      Linus Torvalds authored
      Pull x86 platform driver updates from Andy Shevchenko:
      
       - Enable thermal policy for ASUS TUF FX705DY/FX505DY
      
       - Support left round button on ASUS N56VB
      
       - Support new Mellanox platforms of basic class VMOD0009 and VMOD0010
      
       - Intel Comet Lake, Tiger Lake and Elkhart Lake support in the PMC
         driver
      
       - Big clean-up to Intel PMC core, PMC IPC and SCU IPC drivers
      
       - Touchscreen support for the PiPO W11 tablet
      
      * tag 'platform-drivers-x86-v5.6-1' of git://git.infradead.org/linux-platform-drivers-x86: (64 commits)
        platform/x86: intel_pmc_ipc: Switch to use driver->dev_groups
        platform/x86: intel_pmc_ipc: Propagate error from kstrtoul()
        platform/x86: intel_pmc_ipc: Use octal permissions in sysfs attributes
        platform/x86: intel_pmc_ipc: Get rid of unnecessary includes
        platform/x86: intel_pmc_ipc: Drop ipc_data_readb()
        platform/x86: intel_pmc_ipc: Drop intel_pmc_gcr_read() and intel_pmc_gcr_write()
        platform/x86: intel_pmc_ipc: Make intel_pmc_ipc_raw_cmd() static
        platform/x86: intel_pmc_ipc: Make intel_pmc_ipc_simple_command() static
        platform/x86: intel_pmc_ipc: Make intel_pmc_gcr_update() static
        platform/x86: intel_scu_ipc: Reformat kernel-doc comments of exported functions
        platform/x86: intel_scu_ipc: Drop intel_scu_ipc_raw_command()
        platform/x86: intel_scu_ipc: Drop intel_scu_ipc_io[read|write][8|16]()
        platform/x86: intel_scu_ipc: Drop unused macros
        platform/x86: intel_scu_ipc: Drop unused prototype intel_scu_ipc_fw_update()
        platform/x86: intel_scu_ipc: Sleeping is fine when polling
        platform/x86: intel_scu_ipc: Drop intel_scu_ipc_i2c_cntrl()
        platform/x86: intel_scu_ipc: Remove Lincroft support
        platform/x86: intel_scu_ipc: Add constants for register offsets
        platform/x86: intel_scu_ipc: Fix interrupt support
        platform/x86: intel_scu_ipcutil: Remove default y from Kconfig
        ...
      08c49dc1
    • Linus Torvalds's avatar
      Merge tag 'mmc-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · 9e1af756
      Linus Torvalds authored
      Pull MMC updates from Ulf Hansson:
       "There are no updates for the MEMSTICK subsystem this time. But note
        that I am also carrying a patch from the pinctrl tree, which has been
        shared through an immutable branch.
      
        Summary:
      
        MMC core:
         - Convert to reasonable timeouts for all CMD6 commands (updates for
           BKOPS, CACHE_FLUSH and INAND_CMD38_ARG_EXT_CSD) for eMMC
         - Respect f_max clock rate at card initialization
         - Add gpiod_toggle_active_low() API
         - Consolidate slot-gpio code by using gpiod_toggle_active_low()
      
        MMC host:
         - Add pinctrl_select_default_state() API
         - Consolidate pintctrl code by using pinctrl_select_default_state()
         - mmci: Support any block sizes for SDIO for some variants
         - mmci: Enable reset control for stm32_sdmmc
         - mmc_spi: Toggle SPI_CS_HIGH polarity rather than hard-coding it
         - renesas_sdhi: Add support for the r8a77961 variant
         - renesas_sdhi: A few minor improvements
         - rockchip-dw-mshc: Add support for the rk3308 variant
         - sdhci: Enable support for external DMA controllers
         - sdhci: Fixup error path when sending CMD12
         - sdhci-brcmstb: Add support for 7216b0 variant
         - sdhci-brcmstb: Add support for command queuing (CQHCI)
         - sdhci-brcmstb: Add support for eMMC HS400ES mode
         - sdhci-msm: Add support for the sc7180 variant
         - sdhci-msm: Add support for command queuing (CQHCI)
         - sdhci-of-at91: Add support for the SAM9x60 variant
         - sdhci-of-at91: Improve support for tunings
         - sdhci-of-esdhc: A few fixups for some clock related issues
         - sdhci-omap: Add support for the am335x and the am437x variants
         - sdhci-omap: Improve support for erase operations
         - sdhci-omap: Add support for external DMA"
      
      * tag 'mmc-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (89 commits)
        mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch()
        mmc: block: Use generic_cmd6_time when modifying INAND_CMD38_ARG_EXT_CSD
        mmc: core: Specify timeouts for BKOPS and CACHE_FLUSH for eMMC
        mmc: sdhci-cadence: remove unneeded 'inline' marker
        dt-bindings: mmc: rockchip-dw-mshc: add description for rk3308
        dt-bindings: mmc: convert rockchip dw-mshc bindings to yaml
        dt-bindings: mmc: convert synopsys dw-mshc bindings to yaml
        mmc: sdhci-msm: Add CQHCI support for sdhci-msm
        mmc: sdhci: Let a vendor driver supply and update ADMA descriptor size
        mmc: sdhci-of-esdhc: fix serious issue clock is always disabled
        mmc: sdhci-of-esdhc: fix transfer mode register reading
        mmc: sdhci-brcmstb: Fix incorrect switch to HS mode
        mmc: sdhci-brcmstb: Add support for Command Queuing (CQE)
        mmc: sdhci-brcmstb: Add shutdown callback
        mmc: sdhci-brcmstb: Fix driver to defer on clk_get defer
        mmc: sdhci-brcmstb: Add ability to use HS400ES transfer mode
        dt-bindings: mmc: brcm,sdhci-brcmstb: Add support for 7216b0
        mmc: core: limit probe clock frequency to configured f_max
        mmc: sdhci-milbeaut: Remove redundant platform_get_irq error message
        mmc: sdhci: fix an issue of mixing different types
        ...
      9e1af756
    • Linus Torvalds's avatar
      Merge tag 'i3c/for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux · b9b627a4
      Linus Torvalds authored
      Pull i3c updates from Boris Brezillon:
       "Core changes:
      
         - Make i3c_bus_set_mode() static
      
        Driver changes:
      
         - Add a per-SoC data_hold_delay property to the Cadence driver
      
         - Fix formatting issues in the 'CADENCE I3C MASTER IP' MAINTAINERS
           entry
      
         - Use devm_platform_ioremap_resource() where appropriate
      
         - Adjust DesignWare reattach logic"
      
      * tag 'i3c/for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
        i3c: master: dw: reattach device on first available location of address table
        i3c: master: cdns: convert to devm_platform_ioremap_resource
        i3c: master: dw: convert to devm_platform_ioremap_resource
        MAINTAINERS: fix style in CADENCE I3C MASTER IP entry
        i3c: master: make i3c_bus_set_mode static
        i3c: master: cdns: add data hold delay support
      b9b627a4
    • Linus Torvalds's avatar
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 067ba54c
      Linus Torvalds authored
      Pull x86 microcode update from Borislav Petkov:
       "Another boring branch this time around: mark a stub function inline,
        by Valdis Kletnieks"
      
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/microcode/AMD: Make stub function static inline
      067ba54c
    • Linus Torvalds's avatar
      Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 30f5a756
      Linus Torvalds authored
      Pull RAS updates from Borislav Petkov:
      
       - Misc fixes to the MCE code all over the place, by Jan H. Schönherr.
      
       - Initial support for AMD F19h and other cleanups to amd64_edac, by
         Yazen Ghannam.
      
       - Other small cleanups.
      
      * 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        EDAC/mce_amd: Make fam_ops static global
        EDAC/amd64: Drop some family checks for newer systems
        EDAC/amd64: Add family ops for Family 19h Models 00h-0Fh
        x86/amd_nb: Add Family 19h PCI IDs
        EDAC/mce_amd: Always load on SMCA systems
        x86/MCE/AMD, EDAC/mce_amd: Add new Load Store unit McaType
        x86/mce: Fix use of uninitialized MCE message string
        x86/mce: Fix mce=nobootlog
        x86/mce: Take action on UCNA/Deferred errors again
        x86/mce: Remove mce_inject_log() in favor of mce_log()
        x86/mce: Pass MCE message to mce_panic() on failed kernel recovery
        x86/mce/therm_throt: Mark throttle_active_work() as __maybe_unused
      30f5a756
    • Linus Torvalds's avatar
      Merge tag 'edac_for_5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras · b62061b8
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
       "A totally boring branch this time around: a garden variety of small
        fixes all over the place"
      
      * tag 'edac_for_5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
        EDAC/amd64: Do not warn when removing instances
        EDAC/sifive: Fix return value check in ecc_register()
        EDAC/aspeed: Remove unneeded semicolon
        EDAC: remove set but not used variable 'ecc_loc'
        EDAC: skx_common: downgrade message importance on missing PCI device
        EDAC/Kconfig: Fix Kconfig indentation
      b62061b8
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 35417d57
      Linus Torvalds authored
      Pull hwmon updates from Guenter Roeck:
       "core:
         - Add support for enable attributes to hwmon core
         - Add intrusion templates
      
        pmbus:
         - Support for Infineon Multi-phase xdpe122 family controllers
         - Support for Intel IMVP9 and AMD 6.25mV modes
         - Support for vid mode detection per page bases
         - Detect if chip is write protected
         - Support for MAX20730, MAX20734, MAX20743, MAX20796, UCD90320,
           TPS53688
         - Various improvements to ibm-cffps driver
      
        k10temp:
         - Support for additional temperature sensors as well as voltage and
           current telemetry for Zen CPUs
      
        w83627ehf:
         - Remove support for NCT6775, NCT6776 (they have their own driver)
      
        New drivers:
         - ADM1177
         - MAX31730
         - Driver for disk and solid state drives with temperature sensors
      
        Other:
         - pwm-fan: stop fan on shutdown"
      
      * tag 'hwmon-for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (35 commits)
        hwmon: (k10temp) Display up to eight sets of CCD temperatures
        hwmon: (k10temp) Add debugfs support
        hwmon: (k10temp) Don't show temperature limits on Ryzen (Zen) CPUs
        hwmon: (k10temp) Show core and SoC current and voltages on Ryzen CPUs
        hwmon: (k10temp) Report temperatures per CPU die
        hmon: (k10temp) Convert to use devm_hwmon_device_register_with_info
        hwmon: (k10temp) Use bitops
        hwmon: (pwm-fan) stop fan on shutdown
        MAINTAINERS: add entry for ADM1177 driver
        dt-binding: hwmon: Add documentation for ADM1177
        hwmon: (adm1177) Add ADM1177 Hot Swap Controller and Digital Power Monitor driver
        docs: hwmon: Include 'xdpe12284.rst' into docs
        hwmon: (pmbus) Add support for Infineon Multi-phase xdpe122 family controllers
        hwmon: (pmbus/tps53679) Extend device list supported by driver
        hwmon: (pmbus/core) Add support for Intel IMVP9 and AMD 6.25mV modes
        hwmon: (pmbus/core) Add support for vid mode detection per page bases
        hwmon: (pmbus/ibm-cffps) Prevent writing on_off_config with bad data
        hwmon: (w83627ehf) Remove set but not used variable 'fan4min'
        hwmon: Driver for disk and solid state drives with temperature sensors
        hwmon: (pmbus/ibm-cffps) Fix the LED behavior when turned off
        ...
      35417d57
    • Linus Torvalds's avatar
      Merge tag 'tpmdd-next-20200122' of git://git.infradead.org/users/jjs/linux-tpmdd · 189fc98e
      Linus Torvalds authored
      Pull tpm updates from Jarkko Sakkinen:
       "This adds a new sysfs file for querying TPM major version, which can
        be used by the user space the TPM protocol used to communicate with
        the chip"
      
      * tag 'tpmdd-next-20200122' of git://git.infradead.org/users/jjs/linux-tpmdd:
        tpm: Add tpm_version_major sysfs file
        tpm: Update mailing list contact information in sysfs-class-tpm
      189fc98e
    • Linus Torvalds's avatar
      Merge tag 'm68k-for-v5.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · f11ba7de
      Linus Torvalds authored
      Pull m68k updates from Geert Uytterhoeven:
      
       - wire up clone3() syscall
      
       - defconfig updates
      
      * tag 'm68k-for-v5.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Implement copy_thread_tls()
        m68k: defconfig: Update defconfigs for v5.5-rc3
        m68k: Wire up clone3() syscall
      f11ba7de
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 0238d3c7
      Linus Torvalds authored
      Pull arm64 updates from Will Deacon:
       "The changes are a real mixed bag this time around.
      
        The only scary looking one from the diffstat is the uapi change to
        asm-generic/mman-common.h, but this has been acked by Arnd and is
        actually just adding a pair of comments in an attempt to prevent
        allocation of some PROT values which tend to get used for
        arch-specific purposes. We'll be using them for Branch Target
        Identification (a CFI-like hardening feature), which is currently
        under review on the mailing list.
      
        New architecture features:
      
         - Support for Armv8.5 E0PD, which benefits KASLR in the same way as
           KPTI but without the overhead. This allows KPTI to be disabled on
           CPUs that are not affected by Meltdown, even is KASLR is enabled.
      
         - Initial support for the Armv8.5 RNG instructions, which claim to
           provide access to a high bandwidth, cryptographically secure
           hardware random number generator. As well as exposing these to
           userspace, we also use them as part of the KASLR seed and to seed
           the crng once all CPUs have come online.
      
         - Advertise a bunch of new instructions to userspace, including
           support for Data Gathering Hint, Matrix Multiply and 16-bit
           floating point.
      
        Kexec:
      
         - Cleanups in preparation for relocating with the MMU enabled
      
         - Support for loading crash dump kernels with kexec_file_load()
      
        Perf and PMU drivers:
      
         - Cleanups and non-critical fixes for a couple of system PMU drivers
      
        FPU-less (aka broken) CPU support:
      
         - Considerable fixes to support CPUs without the FP/SIMD extensions,
           including their presence in heterogeneous systems. Good luck
           finding a 64-bit userspace that handles this.
      
        Modern assembly function annotations:
      
         - Start migrating our use of ENTRY() and ENDPROC() over to the
           new-fangled SYM_{CODE,FUNC}_{START,END} macros, which are intended
           to aid debuggers
      
        Kbuild:
      
         - Cleanup detection of LSE support in the assembler by introducing
           'as-instr'
      
         - Remove compressed Image files when building clean targets
      
        IP checksumming:
      
         - Implement optimised IPv4 checksumming routine when hardware offload
           is not in use. An IPv6 version is in the works, pending testing.
      
        Hardware errata:
      
         - Work around Cortex-A55 erratum #1530923
      
        Shadow call stack:
      
         - Work around some issues with Clang's integrated assembler not
           liking our perfectly reasonable assembly code
      
         - Avoid allocating the X18 register, so that it can be used to hold
           the shadow call stack pointer in future
      
        ACPI:
      
         - Fix ID count checking in IORT code. This may regress broken
           firmware that happened to work with the old implementation, in
           which case we'll have to revert it and try something else
      
         - Fix DAIF corruption on return from GHES handler with pseudo-NMIs
      
        Miscellaneous:
      
         - Whitelist some CPUs that are unaffected by Spectre-v2
      
         - Reduce frequency of ASID rollover when KPTI is compiled in but
           inactive
      
         - Reserve a couple of arch-specific PROT flags that are already used
           by Sparc and PowerPC and are planned for later use with BTI on
           arm64
      
         - Preparatory cleanup of our entry assembly code in preparation for
           moving more of it into C later on
      
         - Refactoring and cleanup"
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (73 commits)
        arm64: acpi: fix DAIF manipulation with pNMI
        arm64: kconfig: Fix alignment of E0PD help text
        arm64: Use v8.5-RNG entropy for KASLR seed
        arm64: Implement archrandom.h for ARMv8.5-RNG
        arm64: kbuild: remove compressed images on 'make ARCH=arm64 (dist)clean'
        arm64: entry: Avoid empty alternatives entries
        arm64: Kconfig: select HAVE_FUTEX_CMPXCHG
        arm64: csum: Fix pathological zero-length calls
        arm64: entry: cleanup sp_el0 manipulation
        arm64: entry: cleanup el0 svc handler naming
        arm64: entry: mark all entry code as notrace
        arm64: assembler: remove smp_dmb macro
        arm64: assembler: remove inherit_daif macro
        ACPI/IORT: Fix 'Number of IDs' handling in iort_id_map()
        mm: Reserve asm-generic prot flags 0x10 and 0x20 for arch use
        arm64: Use macros instead of hard-coded constants for MAIR_EL1
        arm64: Add KRYO{3,4}XX CPU cores to spectre-v2 safe list
        arm64: kernel: avoid x18 in __cpu_soft_restart
        arm64: kvm: stop treating register x18 as caller save
        arm64/lib: copy_page: avoid x18 register in assembler code
        ...
      0238d3c7
    • Jiri Kosina's avatar
      Merge branch 'for-5.6/logitech' into for-linus · fef684af
      Jiri Kosina authored
      - voltage support for newer Logitech HID++ devices, from Pedro Vanzella.
      
      - MX Master support improvements, from Adrian Freund and Mazin Rezk
      fef684af
    • Jiri Kosina's avatar
      Merge branch 'for-5.6/hidraw' into for-linus · a09ac40e
      Jiri Kosina authored
      - support for uniq ioctl()
      a09ac40e
    • Linus Torvalds's avatar
      Linux 5.5 · d5226fa6
      Linus Torvalds authored
      d5226fa6
  9. 26 Jan, 2020 9 commits
  10. 25 Jan, 2020 2 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm · 2821e26f
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
      
       - fix ftrace relocation type filtering
      
       - relax arch timer version check
      
      * tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
        ARM: 8955/1: virt: Relax arch timer version check during early boot
        ARM: 8950/1: ftrace/recordmcount: filter relocation types
      2821e26f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 84809aaf
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Off by one in mt76 airtime calculation, from Dan Carpenter.
      
       2) Fix TLV fragment allocation loop condition in iwlwifi, from Luca
          Coelho.
      
       3) Don't confirm neigh entries when doing ipsec pmtu updates, from Xu
          Wang.
      
       4) More checks to make sure we only send TSO packets to lan78xx chips
          that they can actually handle. From James Hughes.
      
       5) Fix ip_tunnel namespace move, from William Dauchy.
      
       6) Fix unintended packet reordering due to cooperation between
          listification done by GRO and non-GRO paths. From Maxim
          Mikityanskiy.
      
       7) Add Jakub Kicincki formally as networking co-maintainer.
      
       8) Info leak in airo ioctls, from Michael Ellerman.
      
       9) IFLA_MTU attribute needs validation during rtnl_create_link(), from
          Eric Dumazet.
      
      10) Use after free during reload in mlxsw, from Ido Schimmel.
      
      11) Dangling pointers are possible in tp->highest_sack, fix from Eric
          Dumazet.
      
      12) Missing *pos++ in various networking seq_next handlers, from Vasily
          Averin.
      
      13) CHELSIO_GET_MEM operation neds CAP_NET_ADMIN check, from Michael
          Ellerman.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (109 commits)
        firestream: fix memory leaks
        net: cxgb3_main: Add CAP_NET_ADMIN check to CHELSIO_GET_MEM
        net: bcmgenet: Use netif_tx_napi_add() for TX NAPI
        tipc: change maintainer email address
        net: stmmac: platform: fix probe for ACPI devices
        net/mlx5e: kTLS, Do not send decrypted-marked SKBs via non-accel path
        net/mlx5e: kTLS, Remove redundant posts in TX resync flow
        net/mlx5e: kTLS, Fix corner-case checks in TX resync flow
        net/mlx5e: Clear VF config when switching modes
        net/mlx5: DR, use non preemptible call to get the current cpu number
        net/mlx5: E-Switch, Prevent ingress rate configuration of uplink rep
        net/mlx5: DR, Enable counter on non-fwd-dest objects
        net/mlx5: Update the list of the PCI supported devices
        net/mlx5: Fix lowest FDB pool size
        net: Fix skb->csum update in inet_proto_csum_replace16().
        netfilter: nf_tables: autoload modules from the abort path
        netfilter: nf_tables: add __nft_chain_type_get()
        netfilter: nf_tables_offload: fix check the chain offload flag
        netfilter: conntrack: sctp: use distinct states for new SCTP connections
        ipv6_route_seq_next should increase position index
        ...
      84809aaf