21 Jan, 2016

8 commits

  • Use kobj_to_dev() instead of open-coding it.

    Signed-off-by: Geliang Tang
    Acked-by: "Bounine, Alexandre"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Geliang Tang
     
  • The only user of the lvalue-ness of the cpu_*_mask variables is in
    drivers/base/cpu.c, and that is mostly a work-around for the fact that not
    even const variables can be used in static initialization. Now that the
    underlying struct cpumasks are exposed we can take their address.

    Signed-off-by: Rasmus Villemoes
    Acked-by: Rusty Russell
    Acked-by: Greg Kroah-Hartman
    Cc: Michael Ellerman
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Rasmus Villemoes
     
  • Now that we have a generic library function for this, replace the
    open-coded instance.

    Signed-off-by: Stephen Boyd
    Cc: Hauke Mehrtens
    Cc:
    Cc: Paul Walmsley
    Cc: Bjorn Andersson
    Cc: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stephen Boyd
     
  • Now that we have a generic library function for this, replace the
    open-coded instance.

    Signed-off-by: Stephen Boyd
    Reviewed-by: Bjorn Andersson
    Cc:
    Cc: David Howells
    Cc: Hauke Mehrtens
    Cc: Paul Walmsley
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stephen Boyd
     
  • Fix build when CONFIG_SERIAL_8250=m and CONFIG_IBM_ASM=y.

    Fixes these build errors:

    drivers/built-in.o: In function `ibmasm_remove_one':
    module.c:(.text+0xf6874): undefined reference to `ibmasm_unregister_uart'
    drivers/built-in.o: In function `ibmasm_init_one':
    module.c:(.text+0xf6c37): undefined reference to `ibmasm_register_uart'

    Signed-off-by: Randy Dunlap
    Cc: Max Asbock
    Cc: Vernon Mauery
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Pull dmaengine fixes from Vinod Koul:
    "Here is my second pull request for this window:

    A few driver fixes have piled up and one missed rcar bindings patch
    which got somehow lost in for-linus branch so cherry-picked that one.

    Fixes are for dw, at_hdmac, edma"

    * tag 'dmaengine-fix-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma:
    dmaengine: rcar-dmac: Document SoC specific bindings
    dmaengine: at_xdmac: fix resume for cyclic transfers
    dmaengine: dw: fix cyclic transfer callbacks
    dmaengine: dw: fix cyclic transfer setup
    dmaengine: edma: Fix paRAM slot allocation for entry channel 0

    Linus Torvalds
     
  • Pull misc kbuild updates from Michal Marek:
    - Fix for make O=... perf-tar*
    - make tags revamp and fix for the fallout. Patch for warnings about
    line breaks inside DEFINE_PER_CPU macros is pending
    - New coccinelle test

    * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    coccinelle: tests: unsigned value cannot be lesser than zero
    tags: Unify emacs and exuberant rules
    tags: Drop the _PE rule
    tags: Do not try to index defconfigs
    tags: Process Kconfig files in a single pass
    tags: Fix erroneous pattern match in a comment
    aic7xxx: Avoid name collision with
    tags: Treat header files as C code
    package Makefile: fix perf-tar targets when outdir is set
    scripts/tags.sh: Teach tags about more powerpc macros

    Linus Torvalds
     
  • Pull kbuild updates from Michal Marek:
    - Make -m in makefiles work like -y and fix the
    fallout
    - Minor genksyms fix
    - Fix race with make -j install modules_install
    - Move -Wsign-compare from make W=1 to W=2
    - Other minor fixes

    * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    kbuild: Demote 'sign-compare' warning to W=2
    Makefile: revert "Makefile: Document ability to make file.lst and file.S" partially
    kbuild: Do not run modules_install and install in paralel
    genksyms: Handle string literals with spaces in reference files
    fixdep: constify strrcmp arguments
    ath10k: Fix build with CONFIG_THERMAL=m
    Revert "drm: Hack around CONFIG_AGP=m build failures"
    kbuild: Allow to specify composite modules with modname-m
    staging/ad7606: Actually build the interface modules

    Linus Torvalds
     

20 Jan, 2016

26 commits

  • …linux-platform-drivers-x86

    Pull x86 platform driver updates from Darren Hart:
    "Add intel punit and telemetry driver for APL SoCs.
    Add intel-hid driver for various laptop hotkey support.
    Add asus-wireless radio control driver.
    Keyboard backlight support/improvements for ThinkPads, Vaio, and Toshiba.
    Several hotkey related fixes and improvements for dell and toshiba.
    Fix oops on dual GPU Macs in apple-gmux.
    A few new device IDs and quirks.
    Various minor config related build issues and cleanups.

    surface pro 4:
    - fix compare_const_fl.cocci warnings
    - Add support for Surface Pro 4 Buttons

    platform/x86:
    - Add Intel Telemetry Debugfs interfaces
    - Add Intel telemetry platform device
    - Add Intel telemetry platform driver
    - Add Intel Telemetry Core Driver
    - add NULL check for input parameters
    - add Intel P-Unit mailbox IPC driver
    - update acpi resource structure for Punit

    thinkpad_acpi:
    - Add support for keyboard backlight

    dell-wmi:
    - Process only one event on devices with interface version 0
    - Check if Dell WMI descriptor structure is valid
    - Improve unknown hotkey handling
    - Use a C99-style array for bios_to_linux_keycode

    tc1100-wmi:
    - fix build warning when CONFIG_PM not enabled

    asus-wireless:
    - Add ACPI HID ATK4001
    - Add Asus Wireless Radio Control driver

    asus-wmi:
    - drop to_platform_driver macro

    intel-hid:
    - new hid event driver for hotkeys

    sony-laptop:
    - Keyboard backlight control for some Vaio Fit models

    ideapad-laptop:
    - Add Lenovo ideapad Y700-17ISK to no_hw_rfkill dmi list

    apple-gmux:
    - Assign apple_gmux_data before registering

    toshiba_acpi:
    - Add rfkill dependency to ACPI_TOSHIBA entry
    - Fix keyboard backlight sysfs entries not being updated
    - Add WWAN RFKill support
    - Add support for WWAN devices
    - Fix blank screen at boot if transflective backlight is supported
    - Propagate the hotkey value via genetlink

    toshiba_bluetooth:
    - Add missing newline in toshiba_bluetooth_present function"

    * tag 'platform-drivers-x86-v4.5-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (29 commits)
    surface pro 4: fix compare_const_fl.cocci warnings
    surface pro 4: Add support for Surface Pro 4 Buttons
    platform:x86: Add Intel Telemetry Debugfs interfaces
    platform:x86: Add Intel telemetry platform device
    platform:x86: Add Intel telemetry platform driver
    platform/x86: Add Intel Telemetry Core Driver
    intel_punit_ipc: add NULL check for input parameters
    thinkpad_acpi: Add support for keyboard backlight
    dell-wmi: Process only one event on devices with interface version 0
    dell-wmi: Check if Dell WMI descriptor structure is valid
    tc1100-wmi: fix build warning when CONFIG_PM not enabled
    asus-wireless: Add ACPI HID ATK4001
    platform/x86: Add Asus Wireless Radio Control driver
    asus-wmi: drop to_platform_driver macro
    intel-hid: new hid event driver for hotkeys
    Keyboard backlight control for some Vaio Fit models
    platform/x86: Add rfkill dependency to ACPI_TOSHIBA entry
    platform:x86: add Intel P-Unit mailbox IPC driver
    intel_pmc_ipc: update acpi resource structure for Punit
    ideapad-laptop: Add Lenovo ideapad Y700-17ISK to no_hw_rfkill dmi list
    ...

    Linus Torvalds
     
  • Move constants to the right of binary operators.

    Generated by: scripts/coccinelle/misc/compare_const_fl.cocci

    CC: Weng Xuetian
    Signed-off-by: Fengguang Wu
    Signed-off-by: Julia Lawall
    Signed-off-by: Darren Hart

    Julia Lawall
     
  • Surface Pro 4 buttons are managed by a device with _HID "MSHW0040"
    different from Surface Pro 3.

    This commit adds MSHW0040 to id list to support the Surface Pro 4.

    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=109871
    Signed-off-by: Weng Xuetian
    Acked-by: Chen Yu
    Signed-off-by: Darren Hart

    Weng Xuetian
     
  • This implements debugfs interfaces for reading the telemetry
    samples from SSRAM and configuring firmware trace verbosity.
    Interface created under /sys/kernel/debug/telemetry
    soc_states: SoC Device and Low Power States
    pss_info: Info from the Primary SubSystem
    ioss_info: Info from IO SubSusytem
    pss_trace_verbosity: Read/Modify PSS F/W trace verbosity
    ioss_trace_verbosity: Read/Modify IOSS F/W trace verbosity.

    Signed-off-by: Souvik Kumar Chakravarty
    Signed-off-by: Darren Hart

    Souvik Kumar Chakravarty
     
  • Telemetry Device is created by the pmc_ipc driver. Resources
    are populated according SSRAM region as indicated by the BIOS tables.

    Signed-off-by: Souvik Kumar Chakravarty
    Signed-off-by: Darren Hart

    Souvik Kumar Chakravarty
     
  • Telemetry platform driver implements the telemetry interfaces.
    Currently it supports ApolloLake. It uses the PUNIT and PMC IPC
    interfaces to configure the telemetry samples to read.
    The samples are read from a Secure SRAM region.

    Signed-off-by: Souvik Kumar Chakravarty
    Signed-off-by: Darren Hart

    Souvik Kumar Chakravarty
     
  • Intel PM Telemetry is a software mechanism via which various SoC
    PM and performance related parameters like PM counters, firmware
    trace verbosity, the status of different devices inside the SoC, etc.
    can be monitored and analyzed. The different samples that may be
    monitored can be configured at runtime via exported APIs.

    This patch adds the telemetry core driver that implements basic
    exported APIs.

    Signed-off-by: Souvik Kumar Chakravarty
    Signed-off-by: Darren Hart

    Souvik Kumar Chakravarty
     
  • intel_punit_ipc_command() maybe called when in or out
    data pointers are NULL.

    Signed-off-by: Qipeng Zha
    Signed-off-by: Darren Hart

    Qipeng Zha
     
  • This patch adds support for controlling keyboard backlight via standard
    linux led class interface (::kbd_backlight). It uses ACPI HKEY device with
    MLCG and MLCS methods.

    Signed-off-by: Pali Rohár
    Tested-by: Fabio D'Urso
    Acked-by: Henrique de Moraes Holschuh
    Signed-off-by: Darren Hart

    Pali Rohár
     
  • BIOS/ACPI on devices with WMI interface version 0 does not clear buffer
    before filling it. So next time when BIOS/ACPI send WMI event which is
    smaller as previous then it contains garbage in buffer from previous event.

    BIOS/ACPI on devices with WMI interface version 1 clears buffer and
    sometimes send more events in buffer at one call.

    Since commit 83fc44c32ad8 ("dell-wmi: Update code for processing WMI
    events") dell-wmi process all events in buffer (and not just first).

    To prevent reading garbage from the buffer we process only the first
    event on devices with WMI interface version 0.

    Signed-off-by: Pali Rohár
    Tested-by: Gabriele Mazzotta
    Signed-off-by: Darren Hart

    Pali Rohár
     
  • After examining existing DSDT ACPI tables of more laptops and looking
    into Dell WMI document mentioned in ML dicussion archived at
    http://www.spinics.net/lists/platform-driver-x86/msg07220.html we will
    parse and check WMI descriptor if contains expected data. It is because
    WMI descriptor contains interface version number and it is needed to
    know in next commit.

    Signed-off-by: Pali Rohár
    Tested-by: Gabriele Mazzotta
    Signed-off-by: Darren Hart

    Pali Rohár
     
  • Conditionally declare suspend_data on CONFIG_PM to avoid
    the following warning when CONFIG_OM is not enabled:

    drivers/platform/x86/tc1100-wmi.c:55:27: warning:
    'suspend_data' defined but not used [-Wunused-variable]

    Signed-off-by: Colin Ian King
    Signed-off-by: Darren Hart

    Colin Ian King
     
  • As reported in https://bugzilla.kernel.org/show_bug.cgi?id=98931#c22 in
    the Asus UX31A the Asus Wireless Radio Control device (ASHS) uses the
    HID "ATK4001".

    Signed-off-by: João Paulo Rechi Vita
    Reported-by: Tasev Nikola
    Signed-off-by: Darren Hart

    João Paulo Rechi Vita
     
  • Some Asus notebooks like the Asus E202SA and the Asus X555UB have a
    separate ACPI device for notifications from the airplane mode hotkey.
    This device is called "Wireless Radio Control" in Asus websites and ASHS
    in the DSDT, and its ACPI _HID is ATK4002 in the two models mentioned
    above.

    For these models, when the airplane mode hotkey (Fn+F2) is pressed, a
    query 0x0B is started in the Embedded Controller, and all this query does
    is a notify ASHS with the value 0x88 (for acpi_osi >= "Windows 2012"):

    Scope (_SB.PCI0.SBRG.EC0)
    {
    (...)
    Method (_Q0B, 0, NotSerialized) // _Qxx: EC Query
    {
    If ((MSOS () >= OSW8))
    {
    Notify (ASHS, 0x88) // Device-Specific
    }
    Else
    {
    (...)
    }
    }
    }

    Signed-off-by: João Paulo Rechi Vita
    Reviewed-by: Andy Shevchenko
    Signed-off-by: Darren Hart

    João Paulo Rechi Vita
     
  • to_platform_driver has been defined in platform_device.h, so drop
    this repetitive macro in asus-wmi.c.

    Signed-off-by: Geliang Tang
    Signed-off-by: Darren Hart

    Geliang Tang
     
  • This driver supports various HID events including hotkeys.
    Dell XPS 13 9350 requires it for the wireless hotkey.

    Signed-off-by: Alex Hung
    Reviewed-and-tested-by: Andy Lutomirski

    [dvhart: Kconfig help typo fix and INPUT_SPARSEKMAP fix from Sedat Dilek]

    Signed-off-by: Darren Hart

    Alex Hung
     
  • SVF1521P6EW, SVF1521DCXW, SVF13N1L2ES and likely most SVF*.
    do not expose separate timeout controls in auto mode.

    Signed-off-by: Dominik Matta
    Signed-off-by: Mattia Dongili
    Signed-off-by: Darren Hart

    Mattia Dongili
     
  • Commit 2fdde83443aa ("toshiba_acpi: Add WWAN RFKill support") added
    WWAN rfkill support to the driver, but the KConfig entry was not
    updated to add the RFKill dependency, causing a broken build if
    RFKill is not selected.

    This patch adds the RFKILL dependency to the KConfig entry, fixing
    the build issue.

    Signed-off-by: Azael Avalos
    Signed-off-by: Darren Hart

    Azael Avalos
     
  • This driver provides support for P-Unit mailbox IPC on Intel platforms.
    The heart of the P-Unit is the Foxton microcontroller and its firmware,
    which provide mailbox interface for power management usage.

    Signed-off-by: Qipeng Zha
    Reviewed-by: Andy Shevchenko
    Signed-off-by: Darren Hart

    Qipeng Zha
     
  • BIOS restructure exported memory resources for Punit
    in acpi table, So update resources for Punit.

    Signed-off-by: Qipeng Zha
    Reviewed-by: Andy Shevchenko
    Signed-off-by: Darren Hart

    Qipeng Zha
     
  • One of the newest ideapad models also lacks a physical hw rfkill switch,
    and trying to read the hw rfkill switch through the ideapad module
    causes it to always reported blocking breaking wifi.

    Fix it by adding this model to the DMI list.

    BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1286293
    Cc: stable@vger.kernel.org
    Signed-off-by: Josh Boyer
    Signed-off-by: Darren Hart

    Josh Boyer
     
  • If DMI lists a hotkey that we don't recognize, log and ignore it
    instead of trying to map it to keycode 0. I haven't seen this happen,
    but it will help maintain the key map in the future and it will help
    avoid sending bogus events.

    This also improves the message that we log when we get an unknown key
    event.

    Signed-off-by: Andy Lutomirski
    Reviewed-by: Pali Rohár
    [dvhart: remove BUILD_BUG_ON per mutual agreement on list]
    Signed-off-by: Darren Hart

    Andy Lutomirski
     
  • Registering the handler after both GPUs will trigger a DDC switch for
    connector reprobing. This will oops if apple_gmux_data hasn't already
    been assigned. Reorder the code to do that.

    [Lukas: More generally, this commit fixes a race condition that
    is triggered by invoking a handler callback between the call to
    vga_switcheroo_register_handler() and the assignment of
    apple_gmux_data.]

    Tested-by: Pierre Moreau
    [MBP 5,3 2009 nvidia MCP79 + G96 pre-retina 15"]
    Tested-by: Paul Hordiienko
    [MBP 6,2 2010 intel ILK + nvidia GT216 pre-retina 15"]
    Tested-by: Lukas Wunner
    [MBP 9,1 2012 intel IVB + nvidia GK107 pre-retina 15"]
    Tested-by: William Brown
    [MBP 8,2 2011 intel SNB + amd turks pre-retina 15"]
    Tested-by: Bruno Bierbaumer
    [MBP 11,3 2013 intel HSW + nvidia GK107 retina 15"]

    Signed-off-by: Matthew Garrett
    Reviewed-by: Lukas Wunner
    Signed-off-by: Lukas Wunner
    Signed-off-by: Darren Hart

    Matthew Garrett
     
  • Certain Toshiba models with the second generation keyboard backlight
    (type 2) do not generate the keyboard backlight changed event (0x92),
    and thus, the sysfs entries are never being updated.

    This patch adds a workquee and a global boolean variable to address
    the issue.

    For those models that do generate the event, the sysfs entries are
    being updated via the *notify function and the boolean is set to
    true to avoid a second call to update the entries.

    For those models that do not generate the event, the workquee is
    used to update the sysfs entries and also to emulate the event via
    netlink, to make userspace aware of such change.

    Signed-off-by: Azael Avalos
    Signed-off-by: Darren Hart

    Azael Avalos
     
  • Pull core block updates from Jens Axboe:
    "We don't have a lot of core changes this time around, it's mostly in
    drivers, which will come in a subsequent pull.

    The cores changes include:

    - blk-mq
    - Prep patch from Christoph, changing blk_mq_alloc_request() to
    take flags instead of just using gfp_t for sleep/nosleep.
    - Doc patch from me, clarifying the difference between legacy
    and blk-mq for timer usage.
    - Fixes from Raghavendra for memory-less numa nodes, and a reuse
    of CPU masks.

    - Cleanup from Geliang Tang, using offset_in_page() instead of open
    coding it.

    - From Ilya, rename request_queue slab to it reflects what it holds,
    and a fix for proper use of bdgrab/put.

    - A real fix for the split across stripe boundaries from Keith. We
    yanked a broken version of this from 4.4-rc final, this one works.

    - From Mike Krinkin, emit a trace message when we split.

    - From Wei Tang, two small cleanups, not explicitly clearing memory
    that is already cleared"

    * 'for-4.5/core' of git://git.kernel.dk/linux-block:
    block: use bd{grab,put}() instead of open-coding
    block: split bios to max possible length
    block: add call to split trace point
    blk-mq: Avoid memoryless numa node encoded in hctx numa_node
    blk-mq: Reuse hardware context cpumask for tags
    blk-mq: add a flags parameter to blk_mq_alloc_request
    Revert "blk-flush: Queue through IO scheduler when flush not required"
    block: clarify blk_add_timer() use case for blk-mq
    bio: use offset_in_page macro
    block: do not initialise statics to 0 or NULL
    block: do not initialise globals to 0 or NULL
    block: rename request_queue slab cache

    Linus Torvalds
     
  • Pull IOMMU updates from Joerg Roedel:
    "The updates include:

    - Small code cleanups in the AMD IOMMUv2 driver

    - Scalability improvements for the DMA-API implementation of the AMD
    IOMMU driver. This is just a starting point, but already showed
    some good improvements in my tests.

    - Removal of the unused Renesas IPMMU/IPMMUI driver

    - Updates for ARM-SMMU include:
    * Some fixes to get the driver working nicely on Broadcom hardware
    * A change to the io-pgtable API to indicate the unit in which to
    flush (all callers converted, with Ack from Laurent)
    * Use of devm_* for allocating/freeing the SMMUv3 buffers

    - Some other small fixes and improvements for other drivers"

    * tag 'iommu-updates-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (46 commits)
    iommu/vt-d: Fix up error handling in alloc_iommu
    iommu/vt-d: Check the return value of iommu_device_create()
    iommu/amd: Remove an unneeded condition
    iommu/amd: Preallocate dma_ops apertures based on dma_mask
    iommu/amd: Use trylock to aquire bitmap_lock
    iommu/amd: Make dma_ops_domain->next_index percpu
    iommu/amd: Relax locking in dma_ops path
    iommu/amd: Initialize new aperture range before making it visible
    iommu/amd: Build io page-tables with cmpxchg64
    iommu/amd: Allocate new aperture ranges in dma_ops_alloc_addresses
    iommu/amd: Optimize dma_ops_free_addresses
    iommu/amd: Remove need_flush from struct dma_ops_domain
    iommu/amd: Iterate over all aperture ranges in dma_ops_area_alloc
    iommu/amd: Flush iommu tlb in dma_ops_free_addresses
    iommu/amd: Rename dma_ops_domain->next_address to next_index
    iommu/amd: Remove 'start' parameter from dma_ops_area_alloc
    iommu/amd: Flush iommu tlb in dma_ops_aperture_alloc()
    iommu/amd: Retry address allocation within one aperture
    iommu/amd: Move aperture_range.offset to another cache-line
    iommu/amd: Add dma_ops_aperture_alloc() function
    ...

    Linus Torvalds
     

19 Jan, 2016

6 commits

  • …6/amd' and 'x86/vt-d' into next

    Joerg Roedel
     
  • Pull virtio barrier rework+fixes from Michael Tsirkin:
    "This adds a new kind of barrier, and reworks virtio and xen to use it.

    Plus some fixes here and there"

    * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (44 commits)
    checkpatch: add virt barriers
    checkpatch: check for __smp outside barrier.h
    checkpatch.pl: add missing memory barriers
    virtio: make find_vqs() checkpatch.pl-friendly
    virtio_balloon: fix race between migration and ballooning
    virtio_balloon: fix race by fill and leak
    s390: more efficient smp barriers
    s390: use generic memory barriers
    xen/events: use virt_xxx barriers
    xen/io: use virt_xxx barriers
    xenbus: use virt_xxx barriers
    virtio_ring: use virt_store_mb
    sh: move xchg_cmpxchg to a header by itself
    sh: support 1 and 2 byte xchg
    virtio_ring: update weak barriers to use virt_xxx
    Revert "virtio_ring: Update weak barriers to use dma_wmb/rmb"
    asm-generic: implement virt_xxx memory barriers
    x86: define __smp_xxx
    xtensa: define __smp_xxx
    tile: define __smp_xxx
    ...

    Linus Torvalds
     
  • Pull AVR32 updates from Hans-Christian Noren Egtvedt.

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
    mmc: atmel: get rid of struct mci_dma_data
    mmc: atmel-mci: restore dma on AVR32
    avr32: wire up missing syscalls
    avr32: wire up accept4 syscall

    Linus Torvalds
     
  • Pull more networking fixes from David Miller:

    1) Fix brcmfmac build with older gcc, from Arend van Spriel.

    2) IRQ values unintentionally truncated to u8 in mlx5 driver, from
    Doron Tsur.

    3) Fix build warnings wrt tcp cgroup changes, from Geert Uytterhoeven.

    4) Limit deep recursion in ovs stack, from Hannes Frederic Sowa.

    5) at803x phy driver bug fixes from, Martin Blumenstingl.

    6) Fix TSO handling in hns driver, from Daode Huang

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (22 commits)
    ovs: limit ovs recursions in ovs_execute_actions to not corrupt stack
    team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid
    net: hns: bug fix about hisilicon TSO BD mode
    brcmfmac: fix BRCMF_FW_NVRAM_DEF macro for older gcc compilers
    net: phy: at803x: Add the interrupt register bit definitions
    net: phy: at803x: Clean up duplicate register definitions
    net: phy: at803x: Allow specifying the RGMII RX clock delay via phy mode
    net: phy: at803x: Don't set gbit features for the AR8030 phy
    arm64: bpf: add extra pass to handle faulty codegen
    arm64: insn: remove BUG_ON from codegen
    sctp: the temp asoc's transports should not be hashed/unhashed
    net/mlx5_core: Fix trimming down IRQ number
    tcp_memcontrol: Forward declare cgroup_subsys and mem_cgroup stucts
    batman-adv: Drop immediate orig_node free function
    batman-adv: Drop immediate batadv_hard_iface free function
    batman-adv: Drop immediate neigh_ifinfo free function
    batman-adv: Drop immediate batadv_hardif_neigh_node free function
    batman-adv: Drop immediate batadv_neigh_node free function
    batman-adv: Drop immediate batadv_orig_ifinfo free function
    batman-adv: Avoid recursive call_rcu for batadv_nc_node
    ...

    Linus Torvalds
     
  • Pull IDE updates from David Miller:
    "Just a few small changes this merge window, marking ops const, printf
    string type fixes, etc"

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
    drivers/ide: make ide-scan-pci.c driver explicitly non-modular
    ide: constify ide_dma_ops structures
    ide: silence some underflow warnings

    Linus Torvalds
     
  • Pull RTC updates from Alexandre Belloni:
    "Core:
    - fix module reference count in rtc-proc
    - Replace simple_strtoul by kstrtoul

    New driver:
    - Epson RX8010SJ

    Subsystem wide cleanups:
    - use %ph for short hex dumps
    - constify *_chip_ops structures

    Drivers:
    - abx80x: Microcrystal rv1805 support, alarm support
    - cmos: prevent kernel warning on IRQ flags mismatch
    - s5m: various cleanups
    - rv8803: rx8900 compatibility, small error path fix
    - sunxi: various cleanups
    - lpc32xx: remove irq > NR_IRQS check from probe()
    - imxdi: fix spelling mistake in warning message
    - ds1685: don't try to micromanage sysfs output size
    - da9063: avoid writing undefined data to rtc
    - gemini: Remove unnecessary platform_set_drvdata()
    - efi: add efi_procfs in efi_rtc_ops
    - pcf8523: refuse to write dates later than 2099"

    * tag 'rtc-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (24 commits)
    rtc: cmos: prevent kernel warning on IRQ flags mismatch
    rtc: rtc-ds2404: constify ds2404_chip_ops structures
    rtc: s5m: Make register configuration per S2MPS device to remove exceptions
    rtc: s5m: Add separate field for storing auto-cleared mask in register config
    rtc: s5m: Cleanup by removing useless 'rtc' prefix from fields
    rtc: Replace simple_strtoul by kstrtoul
    rtc: abx80x: add alarm support
    rtc: abx80x: Add Microcrystal rv1805 support
    rtc: v3020: constify v3020_chip_ops structures
    rtc: rv8803: Extend compatibility with the rx8900
    rtc: rv8803: fix handling return value of i2c_smbus_read_byte_data
    rtc: Add Epson RX8010SJ RTC driver
    rtc: lpc32xx: remove irq > NR_IRQS check from probe()
    rtc: imxdi: fix spelling mistake in warning message
    rtc: ds1685: don't try to micromanage sysfs output size
    rtc: use %ph for short hex dumps
    rtc: da9063: avoid writing undefined data to rtc
    rtc: sunxi: use of_device_get_match_data
    rtc: sunxi: constify the data_year_param structure
    rtc: sunxi: fix signedness issues
    ...

    Linus Torvalds