Skip to content
  1. Apr 08, 2020
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://github.com/openrisc/linux · d5d24766
      Linus Torvalds authored
      Pull OpenRISC updates from Stafford Horne:
       "A few cleanups all over the place, things of note:
      
         - Enable the clone3 syscall
      
         - Remove CONFIG_CROSS_COMPILE from Krzysztof Kozlowski
      
         - Update to use mmgrab from Julia Lawall"
      
      * tag 'for-linus' of git://github.com/openrisc/linux:
        openrisc: Remove obsolete show_trace_task function
        openrisc: Cleanup copy_thread_tls docs and comments
        openrisc: Enable the clone3 syscall
        openrisc: Convert copy_thread to copy_thread_tls
        openrisc: use mmgrab
        openrisc: configs: Cleanup CONFIG_CROSS_COMPILE
      d5d24766
    • Linus Torvalds's avatar
      Merge branch 'parisc-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · f9db97d7
      Linus Torvalds authored
      Pull parisc updates from Helge Deller:
       "Some cleanups in arch_rw locking functions, improved interrupt
        handling in arch spinlocks, coversions to request_irq() and syscall
        table generation cleanups"
      
      * 'parisc-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: remove nargs from __SYSCALL
        parisc: Refactor alternative code to accept multiple conditions
        parisc: Rework arch_rw locking functions
        parisc: Improve interrupt handling in arch_spin_lock_flags()
        parisc: Replace setup_irq() by request_irq()
      f9db97d7
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 12782fbe
      Linus Torvalds authored
      Pull sparc update from David Miller:
       "A per-device DMA ops conversion for sparc32 by Chrstioph Hellwig"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc32: use per-device dma_ops
      12782fbe
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 498ff42d
      Linus Torvalds authored
      Pull IDE update from David Miller:
       "As usual, very quiet in this subsystem.
      
        Just a list_for_each_entry_safe() conversion"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        drivers/ide: Fix build regression.
        drivers/ide: convert to list_for_each_entry_safe()
      498ff42d
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 479a72c0
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Slave bond and team devices should not be assigned ipv6 link local
          addresses, from Jarod Wilson.
      
       2) Fix clock sink config on some at803x PHY devices, from Oleksij
          Rempel.
      
       3) Uninitialized stack space transmitted in slcan frames, fix from
          Richard Palethorpe.
      
       4) Guard HW VLAN ops properly in stmmac driver, from Jose Abreu.
      
       5) "=" --> "|=" fix in aquantia driver, from Colin Ian King.
      
       6) Fix TCP fallback in mptcp, from Florian Westphal. (accessing a plain
          tcp_sk as if it were an mptcp socket).
      
       7) Fix cavium driver in some configurations wrt. PTP, from Yue Haibing.
      
       8) Make ipv6 and ipv4 consistent in the lower bound allowed for
          neighbour entry retrans_time, from Hangbin Liu.
      
       9) Don't use private workqueue in pegasus usb driver, from Petko
          Manolov.
      
      10) Fix integer overflow in mlxsw, from Colin Ian King.
      
      11) Missing refcnt init in cls_tcindex, from Cong Wang.
      
      12) One too many loop iterations when processing cmpri entries in ipv6
          rpl code, from Alexander Aring.
      
      13) Disable SG and TSO by default in r8169, from Heiner Kallweit.
      
      14) NULL deref in macsec, from Davide Caratti.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (42 commits)
        macsec: fix NULL dereference in macsec_upd_offload()
        skbuff.h: Improve the checksum related comments
        net: dsa: bcm_sf2: Ensure correct sub-node is parsed
        qed: remove redundant assignment to variable 'rc'
        wimax: remove some redundant assignments to variable result
        mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE
        mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_PRIORITY
        r8169: change back SG and TSO to be disabled by default
        net: dsa: bcm_sf2: Do not register slave MDIO bus with OF
        ipv6: rpl: fix loop iteration
        tun: Don't put_page() for all negative return values from XDP program
        net: dsa: mt7530: fix null pointer dereferencing in port5 setup
        mptcp: add some missing pr_fmt defines
        net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers
        net_sched: fix a missing refcnt in tcindex_init()
        net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting
        mlxsw: spectrum_trap: fix unintention integer overflow on left shift
        pegasus: Remove pegasus' own workqueue
        neigh: support smaller retrans_time settting
        net: openvswitch: use hlist_for_each_entry_rcu instead of hlist_for_each_entry
        ...
      479a72c0
    • Linus Torvalds's avatar
      Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux · 07d6f6dc
      Linus Torvalds authored
      Pull pcmcia updates from Dominik Brodowski:
       "A few PCMCIA odd fixes: removing a few spaces and useless casts,
        replacing snprintf() with scnprintf(), and replacing zero-length
        arrays with a flexible-array member"
      
      * 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
        pcmcia: remove some unused space characters
        pcmcia: soc_common.h: Replace zero-length array with flexible-array member
        pcmcia: cs_internal.h: Replace zero-length array with flexible-array member
        pcmcia: Use scnprintf() for avoiding potential buffer overflow
        pcmcia: omap: remove useless cast for driver.name
      07d6f6dc
  2. Apr 07, 2020
    • Linus Torvalds's avatar
      Merge tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 7e634208
      Linus Torvalds authored
      Pull more ACPI updates from Rafael Wysocki:
       "Additional ACPI updates.
      
        These update the ACPICA code in the kernel to the 20200326 upstream
        revision, fix an ACPI-related CPU hotplug deadlock on x86, update
        Intel Tiger Lake device IDs in some places, add a new ACPI backlight
        blacklist entry, update the "acpi_backlight" kernel command line
        switch documentation and clean up a CPPC library routine.
      
        Specifics:
      
         - Update the ACPICA code in the kernel to upstream revision 20200326
           including:
            * Fix for a typo in a comment field (Bob Moore)
            * acpiExec namespace init file fixes (Bob Moore)
            * Addition of NHLT to the known tables list (Cezary Rojewski)
            * Conversion of PlatformCommChannel ASL keyword to PCC (Erik
              Kaneda)
            * acpiexec cleanup (Erik Kaneda)
            * WSMT-related typo fix (Erik Kaneda)
            * sprintf() utility function fix (John Levon)
            * IVRS IVHD type 11h parsing implementation (Michał Żygowski)
            * IVRS IVHD type 10h reserved field name fix (Michał Żygowski)
      
         - Fix ACPI-related CPU hotplug deadlock on x86 (Qian Cai)
      
         - Fix Intel Tiger Lake ACPI device IDs in several places (Gayatri
           Kammela)
      
         - Add ACPI backlight blacklist entry for Acer Aspire 5783z (Hans de
           Goede)
      
         - Fix documentation of the "acpi_backlight" kernel command line
           switch (Randy Dunlap)
      
         - Clean up the acpi_get_psd_map() CPPC library routine (Liguang
           Zhang)"
      
      * tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        x86: ACPI: fix CPU hotplug deadlock
        thermal: int340x_thermal: fix: Update Tiger Lake ACPI device IDs
        platform/x86: intel-hid: fix: Update Tiger Lake ACPI device ID
        ACPI: Update Tiger Lake ACPI device IDs
        ACPI: video: Use native backlight on Acer Aspire 5783z
        ACPI: video: Docs update for "acpi_backlight" kernel parameter options
        ACPICA: Update version 20200326
        ACPICA: Fixes for acpiExec namespace init file
        ACPICA: Add NHLT table signature
        ACPICA: WSMT: Fix typo, no functional change
        ACPICA: utilities: fix sprintf()
        ACPICA: acpiexec: remove redeclaration of acpi_gbl_db_opt_no_region_support
        ACPICA: Change PlatformCommChannel ASL keyword to PCC
        ACPICA: Fix IVRS IVHD type 10h reserved field name
        ACPICA: Implement IVRS IVHD type 11h parsing
        ACPICA: Fix a typo in a comment field
        ACPI: CPPC: clean up acpi_get_psd_map()
      7e634208
    • Davide Caratti's avatar
      macsec: fix NULL dereference in macsec_upd_offload() · aa81700c
      Davide Caratti authored
      
      
      macsec_upd_offload() gets the value of MACSEC_OFFLOAD_ATTR_TYPE
      without checking its presence in the request message, and this causes
      a NULL dereference. Fix it rejecting any configuration that does not
      include this attribute.
      
      Reported-and-tested-by: default avatar <syzbot+7022ab7c383875c17eff@syzkaller.appspotmail.com>
      Fixes: dcb780fb
      
       ("net: macsec: add nla support for changing the offloading selection")
      Signed-off-by: default avatarDavide Caratti <dcaratti@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      aa81700c
    • Dexuan Cui's avatar
      skbuff.h: Improve the checksum related comments · db1f00fb
      Dexuan Cui authored
      
      
      Fixed the punctuation and some typos.
      Improved some sentences with minor changes.
      
      No change of semantics or code.
      
      Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
      Reviewed-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: default avatarDexuan Cui <decui@microsoft.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      db1f00fb
    • Florian Fainelli's avatar
      net: dsa: bcm_sf2: Ensure correct sub-node is parsed · afa3b592
      Florian Fainelli authored
      When the bcm_sf2 was converted into a proper platform device driver and
      used the new dsa_register_switch() interface, we would still be parsing
      the legacy DSA node that contained all the port information since the
      platform firmware has intentionally maintained backward and forward
      compatibility to client programs. Ensure that we do parse the correct
      node, which is "ports" per the revised DSA binding.
      
      Fixes: d9338023
      
       ("net: dsa: bcm_sf2: Make it a real platform device driver")
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Reviewed-by: default avatarVivien Didelot <vivien.didelot@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      afa3b592
    • Colin Ian King's avatar
      qed: remove redundant assignment to variable 'rc' · 7df0a6a3
      Colin Ian King authored
      
      
      The variable 'rc' is being assigned a value that is never read
      and it is being updated later with a new value. The assignment
      is redundant and can be removed.
      
      Addresses-Coverity: ("Unused value")
      Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7df0a6a3
    • Colin Ian King's avatar
      wimax: remove some redundant assignments to variable result · 2dd6a24f
      Colin Ian King authored
      
      
      In function i2400m_bm_buf_alloc there is no need to use a variable
      'result' to return -ENOMEM, just return the literal value. In the
      function i2400m_setup the variable 'result' is initialized with a
      value that is never read, it is a redundant assignment that can
      be removed.
      
      Addresses-Coverity: ("Unused value")
      Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2dd6a24f
    • Linus Torvalds's avatar
      Merge tag 'pm-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · ef05db16
      Linus Torvalds authored
      Pull more power management updates from Rafael Wysocki:
       "Additional power management updates.
      
        These fix a corner-case suspend-to-idle wakeup issue on systems where
        the ACPI SCI is shared with another wakeup source, add a kernel
        command line option to set pm_debug_messages via the kernel command
        line, add a document desctibing system-wide suspend and resume code
        flows, modify cpufreq Kconfig to choose schedutil as the preferred
        governor by default in a couple of cases and do some assorted
        cleanups.
      
        Specifics:
      
         - Fix corner-case suspend-to-idle wakeup issue on systems where the
           ACPI SCI is shared with another wakeup source (Hans de Goede).
      
         - Add document describing system-wide suspend and resume code flows
           to the admin guide (Rafael Wysocki).
      
         - Add kernel command line option to set pm_debug_messages (Chen Yu).
      
         - Choose schedutil as the preferred scaling governor by default on
           ARM big.LITTLE systems and on x86 systems using the intel_pstate
           driver in the passive mode (Linus Walleij, Rafael Wysocki).
      
         - Drop racy and redundant checks from the PM core's device_prepare()
           routine (Rafael Wysocki).
      
         - Make resume from hibernation take the hibernation_restore() return
           value into account (Dexuan Cui)"
      
      * tag 'pm-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        platform/x86: intel_int0002_vgpio: Use acpi_register_wakeup_handler()
        ACPI: PM: Add acpi_[un]register_wakeup_handler()
        Documentation: PM: sleep: Document system-wide suspend code flows
        cpufreq: Select schedutil when using big.LITTLE
        PM: sleep: Add pm_debug_messages kernel command line option
        PM: sleep: core: Drop racy and redundant checks from device_prepare()
        PM: hibernate: Propagate the return value of hibernation_restore()
        cpufreq: intel_pstate: Select schedutil as the default governor
      ef05db16
    • David S. Miller's avatar
      Merge branch 'mlxsw-fixes' · 19a46799
      David S. Miller authored
      
      
      Ido Schimmel says:
      
      ====================
      mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_{VLAN_MANGLE, PRIORITY}
      
      Petr says:
      
      The handlers for FLOW_ACTION_VLAN_MANGLE and FLOW_ACTION_PRIORITY end by
      returning whatever the lower-level function that they call returns. If
      there are more actions lined up after one of these actions, those are
      never offloaded. Each of the two patches fixes one of those actions.
      
      v2:
      * Patch #1: Use valid SHA1 ID in Fixes line (Dave)
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      19a46799
    • Petr Machata's avatar
      mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE · ccfc5693
      Petr Machata authored
      The handler for FLOW_ACTION_VLAN_MANGLE ends by returning whatever the
      lower-level function that it calls returns. If there are more actions lined
      up after this action, those are never offloaded. Fix by only bailing out
      when the called function returns an error.
      
      Fixes: a150201a
      
       ("mlxsw: spectrum: Add support for vlan modify TC action")
      Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
      Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ccfc5693
    • Petr Machata's avatar
      mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_PRIORITY · 0be0ae14
      Petr Machata authored
      The handler for FLOW_ACTION_PRIORITY ends by returning whatever the
      lower-level function that it calls returns. If there are more actions lined
      up after this action, those are never offloaded. Fix by only bailing out
      when the called function returns an error.
      
      Fixes: 463957e3
      
       ("mlxsw: spectrum_flower: Offload FLOW_ACTION_PRIORITY")
      Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
      Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0be0ae14
    • Heiner Kallweit's avatar
      r8169: change back SG and TSO to be disabled by default · 95099c56
      Heiner Kallweit authored
      There has been a number of reports that using SG/TSO on different chip
      versions results in tx timeouts. However for a lot of people SG/TSO
      works fine. Therefore disable both features by default, but allow users
      to enable them. Use at own risk!
      
      Fixes: 93681cd7
      
       ("r8169: enable HW csum and TSO")
      Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      95099c56
    • Florian Fainelli's avatar
      net: dsa: bcm_sf2: Do not register slave MDIO bus with OF · 536fab5b
      Florian Fainelli authored
      We were registering our slave MDIO bus with OF and doing so with
      assigning the newly created slave_mii_bus of_node to the master MDIO bus
      controller node. This is a bad thing to do for a number of reasons:
      
      - we are completely lying about the slave MII bus is arranged and yet we
        still want to control which MDIO devices it probes. It was attempted
        before to play tricks with the bus_mask to perform that:
        https://www.spinics.net/lists/netdev/msg429420.html but the approach
        was rightfully rejected
      
      - the device_node reference counting is messed up and we are effectively
        doing a double probe on the devices we already probed using the
        master, this messes up all resources reference counts (such as clocks)
      
      The proper fix for this as indicated by David in his reply to the
      thread above is to use a platform data style registration so as to
      control exactly which devices we probe:
      https://www.spinics.net/lists/netdev/msg430083.html
      
      By using mdiobus_register(), our slave_mii_bus->phy_mask value is used
      as intended, and all the PHY addresses that must be redirected towards
      our slave MDIO bus is happening while other addresses get redirected
      towards the master MDIO bus.
      
      Fixes: 461cd1b0
      
       ("net: dsa: bcm_sf2: Register our slave MDIO bus")
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Reviewed-by: default avatarVivien Didelot <vivien.didelot@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      536fab5b
    • Alexander Aring's avatar
      ipv6: rpl: fix loop iteration · a7f9a6f4
      Alexander Aring authored
      This patch fix the loop iteration by not walking over the last
      iteration. The cmpri compressing value exempt the last segment. As the
      code shows the last iteration will be overwritten by cmpre value
      handling which is for the last segment.
      
      I think this doesn't end in any bufferoverflows because we work on worst
      case temporary buffer sizes but it ends in not best compression settings
      in some cases.
      
      Fixes: 8610c7c6
      
       ("net: ipv6: add support for rpl sr exthdr")
      Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a7f9a6f4
    • Will Deacon's avatar
      tun: Don't put_page() for all negative return values from XDP program · bee34890
      Will Deacon authored
      When an XDP program is installed, tun_build_skb() grabs a reference to
      the current page fragment page if the program returns XDP_REDIRECT or
      XDP_TX. However, since tun_xdp_act() passes through negative return
      values from the XDP program, it is possible to trigger the error path by
      mistake and accidentally drop a reference to the fragments page without
      taking one, leading to a spurious free. This is believed to be the cause
      of some KASAN use-after-free reports from syzbot [1], although without a
      reproducer it is not possible to confirm whether this patch fixes the
      problem.
      
      Ensure that we only drop a reference to the fragments page if the XDP
      transmit or redirect operations actually fail.
      
      [1] https://syzkaller.appspot.com/bug?id=e76a6af1be4acd727ff6bbca669833f98cbf5d95
      
      
      
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Alexei Starovoitov <ast@kernel.org>
      Cc: Daniel Borkmann <daniel@iogearbox.net>
      CC: Eric Dumazet <edumazet@google.com>
      Acked-by: default avatarJason Wang <jasowang@redhat.com>
      Fixes: 8ae1aff0
      
       ("tuntap: split out XDP logic")
      Signed-off-by: default avatarWill Deacon <will@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bee34890
    • Linus Torvalds's avatar
      Merge tag 'csky-for-linus-5.7-rc1' of git://github.com/c-sky/csky-linux · f183d269
      Linus Torvalds authored
      Pull csky updates from Guo Ren:
      
       - Add kproobes/uprobes support
      
       - Add lockdep, rseq, gcov support
      
       - Fixup init_fpu
      
       - Fixup ftrace_modify deadlock
      
       - Fixup speculative execution on IO area
      
      * tag 'csky-for-linus-5.7-rc1' of git://github.com/c-sky/csky-linux:
        csky: Fixup cpu speculative execution to IO area
        csky: Add uprobes support
        csky: Add kprobes supported
        csky: Enable LOCKDEP_SUPPORT
        csky: Enable the gcov function
        csky: Fixup get wrong psr value from phyical reg
        csky/ftrace: Fixup ftrace_modify_code deadlock without CPU_HAS_ICACHE_INS
        csky: Implement ftrace with regs
        csky: Add support for restartable sequence
        csky: Implement ptrace regs and stack API
        csky: Fixup init_fpu compile warning with __init
      f183d269
  3. Apr 06, 2020
    • Linus Torvalds's avatar
      Merge tag 'fsnotify_for_v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · b6ff1070
      Linus Torvalds authored
      Pull fsnotify updates from Jan Kara:
       "This implements the fanotify FAN_DIR_MODIFY event.
      
        This event reports the name in a directory under which a change
        happened and together with the directory filehandle and fstatat()
        allows reliable and efficient implementation of directory
        synchronization"
      
      * tag 'fsnotify_for_v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        fanotify: Fix the checks in fanotify_fsid_equal
        fanotify: report name info for FAN_DIR_MODIFY event
        fanotify: record name info for FAN_DIR_MODIFY event
        fanotify: Drop fanotify_event_has_fid()
        fanotify: prepare to report both parent and child fid's
        fanotify: send FAN_DIR_MODIFY event flavor with dir inode and name
        fanotify: divorce fanotify_path_event and fanotify_fid_event
        fanotify: Store fanotify handles differently
        fanotify: Simplify create_fd()
        fanotify: fix merging marks masks with FAN_ONDIR
        fanotify: merge duplicate events on parent and child
        fsnotify: replace inode pointer with an object id
        fsnotify: simplify arguments passing to fsnotify_parent()
        fsnotify: use helpers to access data by data_type
        fsnotify: funnel all dirent events through fsnotify_name()
        fsnotify: factor helpers fsnotify_dentry() and fsnotify_file()
        fsnotify: tidy up FS_ and FAN_ constants
      b6ff1070
    • Linus Torvalds's avatar
      Merge tag 'for_v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 74e934ba
      Linus Torvalds authored
      Pull ext2/udf updates from Jan Kara:
       "Cleanups and fixes for ext2 and one cleanup for udf"
      
      * tag 'for_v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        ext2: fix empty body warnings when -Wextra is used
        ext2: fix debug reference to ext2_xattr_cache
        udf: udf_sb.h: Replace zero-length array with flexible-array member
        ext2: xattr.h: Replace zero-length array with flexible-array member
        ext2: Silence lockdep warning about reclaim under xattr_sem
      74e934ba
    • Linus Torvalds's avatar
      Merge tag '9p-for-5.7' of git://github.com/martinetd/linux · e14679b6
      Linus Torvalds authored
      Pull 9p updates from Dominique Martinet:
       "Not much new, but a few patches for this cycle:
      
         - Fix read with O_NONBLOCK to allow incomplete read and return
           immediately
      
         - Rest is just cleanup (indent, unused field in struct, extra
           semicolon)"
      
      * tag '9p-for-5.7' of git://github.com/martinetd/linux:
        net/9p: remove unused p9_req_t aux field
        9p: read only once on O_NONBLOCK
        9pnet: allow making incomplete read requests
        9p: Remove unneeded semicolon
        9p: Fix Kconfig indentation
      e14679b6
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 77a73eec
      Linus Torvalds authored
      Pull vfs pathwalk fix from Al Viro:
       "Dumb braino in legitimize_path()..."
      
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        fix a braino in legitimize_path()
      77a73eec
    • Al Viro's avatar
      fix a braino in legitimize_path() · 5bd73286
      Al Viro authored
      
      
      brown paperbag time... wrong order of arguments ended up confusing
      the values to check dentry and mount_lock seqcounts against.
      
      Reported-by: default avatarkernel test robot <rong.a.chen@intel.com>
      Fixes: 2aa38470
      
       ("non-RCU analogue of the previous commit")
      Tested-by: default avatarkernel test robot <rong.a.chen@intel.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      5bd73286
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-cppc', 'acpi-video' and 'acpi-drivers' · 33ae7f71
      Rafael J. Wysocki authored
      * acpi-cppc:
        ACPI: CPPC: clean up acpi_get_psd_map()
      
      * acpi-video:
        ACPI: video: Use native backlight on Acer Aspire 5783z
        ACPI: video: Docs update for "acpi_backlight" kernel parameter options
      
      * acpi-drivers:
        thermal: int340x_thermal: fix: Update Tiger Lake ACPI device IDs
        platform/x86: intel-hid: fix: Update Tiger Lake ACPI device ID
        ACPI: Update Tiger Lake ACPI device IDs
      33ae7f71
    • Rafael J. Wysocki's avatar
      Merge branch 'acpica' · fd036058
      Rafael J. Wysocki authored
      * acpica:
        ACPICA: Update version 20200326
        ACPICA: Fixes for acpiExec namespace init file
        ACPICA: Add NHLT table signature
        ACPICA: WSMT: Fix typo, no functional change
        ACPICA: utilities: fix sprintf()
        ACPICA: acpiexec: remove redeclaration of acpi_gbl_db_opt_no_region_support
        ACPICA: Change PlatformCommChannel ASL keyword to PCC
        ACPICA: Fix IVRS IVHD type 10h reserved field name
        ACPICA: Implement IVRS IVHD type 11h parsing
        ACPICA: Fix a typo in a comment field
      fd036058
    • Rafael J. Wysocki's avatar
      Merge branches 'pm-sleep' and 'pm-cpufreq' · 54032b86
      Rafael J. Wysocki authored
      * pm-sleep:
        Documentation: PM: sleep: Document system-wide suspend code flows
        PM: sleep: Add pm_debug_messages kernel command line option
        PM: sleep: core: Drop racy and redundant checks from device_prepare()
        PM: hibernate: Propagate the return value of hibernation_restore()
      
      * pm-cpufreq:
        cpufreq: Select schedutil when using big.LITTLE
        cpufreq: intel_pstate: Select schedutil as the default governor
      54032b86
    • Firoz Khan's avatar
      parisc: remove nargs from __SYSCALL · 106c9092
      Firoz Khan authored
      
      
      The __SYSCALL macro's arguments are system call number,
      system call entry name and number of arguments for the
      system call.
      
      Argument- nargs in __SYSCALL(nr, entry, nargs) is neither
      calculated nor used anywhere. So it would be better to
      keep the implementaion as  __SYSCALL(nr, entry). This will
      unifies the implementation with some other architetures
      too.
      
      Signed-off-by: default avatarFiroz Khan <firoz.khan@linaro.org>
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      106c9092
    • Helge Deller's avatar
      parisc: Refactor alternative code to accept multiple conditions · 2a3778e7
      Helge Deller authored
      
      
      Allow the alternative loop to accept multiple conditions when replacing
      existing code, e.g.
      	ALTERNATIVE(ALT_COND_NO_SMP | ALT_COND_RUN_ON_QEMU, INSN_NOP)
      
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      2a3778e7
    • Linus Torvalds's avatar
      Merge tag 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · a10c9c71
      Linus Torvalds authored
      Pull power supply and reset changes from Sebastian Reichel:
       "Core:
         - Nothing
      
        Drivers:
         - at91-reset: cleanups, proper handling for sam9x60
         - sc27xx, charger-manager: allow building as module
         - sc27xx: add support to read current charge capacity
         - axp288: more quirks for weird hardware
         - misc fixes"
      
      * tag 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (26 commits)
        power: reset: sc27xx: Allow the SC27XX poweroff driver building into a module
        power: reset: sc27xx: Change to use cpu_down()
        power: reset: sc27xx: Power off the external subsystems' connection
        power: twl4030: Use scnprintf() for avoiding potential buffer overflow
        power: supply: bq27xxx_battery: Silence deferred-probe error
        power: reset: at91-reset: handle nrst async for sam9x60
        power: reset: at91-reset: get rid of at91_reset_data
        power: reset: at91-reset: keep only one reset function
        power: reset: at91-reset: make at91sam9g45_restart() generic
        power: reset: at91-reset: introduce ramc_lpr to struct at91_reset
        power: reset: at91-reset: use r4 as tmp argument
        power: reset: at91-reset: introduce args member in at91_reset_data
        power: reset: at91-reset: introduce struct at91_reset_data
        power: reset: at91-reset: devm_kzalloc() for at91_reset data structure
        power: reset: at91-reset: pass rstc base address to at91_reset_status()
        power: reset: at91-reset: convert reset in pointer to struct at91_reset
        power: reset: at91-reset: add notifier block to struct at91_reset
        power: reset: at91-reset: add sclk to struct at91_reset
        power: reset: at91-reset: add ramc_base[] to struct at91_reset
        power: reset: at91-reset: introduce struct at91_reset
        ...
      a10c9c71
    • Helge Deller's avatar
      parisc: Rework arch_rw locking functions · fbdc8f0f
      Helge Deller authored
      
      
      Clean up the arch read/write locking functions based on the arc
      implemenation. This improves readability of those functions.
      
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      fbdc8f0f
    • Helge Deller's avatar
      parisc: Improve interrupt handling in arch_spin_lock_flags() · 2772f0ef
      Helge Deller authored
      
      
      Rewrite arch_spin_lock() and arch_spin_lock_flags() to not re-enable and
      disable the PSW_SM_I interrupt flag too often.
      
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      2772f0ef
    • afzal mohammed's avatar
      parisc: Replace setup_irq() by request_irq() · 997ba657
      afzal mohammed authored
      request_irq() is preferred over setup_irq(). Invocations of setup_irq()
      occur after memory allocators are ready.
      
      Per tglx[1], setup_irq() existed in olden days when allocators were not
      ready by the time early interrupts were initialized.
      
      Hence replace setup_irq() by request_irq().
      
      [1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos
      
      
      
      Signed-off-by: default avatarafzal mohammed <afzal.mohd.ma@gmail.com>
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      997ba657
    • Linus Torvalds's avatar
      Merge tag 'perf-urgent-2020-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c48b0722
      Linus Torvalds authored
      Pull more perf updates from Thomas Gleixner:
       "Perf updates all over the place:
      
        core:
      
         - Support for cgroup tracking in samples to allow cgroup based
           analysis
      
        tools:
      
         - Support for cgroup analysis
      
         - Commandline option and hotkey for perf top to change the sort order
      
         - A set of fixes all over the place
      
         - Various build system related improvements
      
         - Updates of the X86 pmu event JSON data
      
         - Documentation updates"
      
      * tag 'perf-urgent-2020-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (55 commits)
        perf python: Fix clang detection to strip out options passed in $CC
        perf tools: Support Python 3.8+ in Makefile
        perf script: Fix invalid read of directory entry after closedir()
        perf script report: Fix SEGFAULT when using DWARF mode
        perf script: add -S/--symbols documentation
        perf pmu-events x86: Use CPU_CLK_UNHALTED.THREAD in Kernel_Utilization metric
        perf events parser: Add missing Intel CPU events to parser
        perf script: Allow --symbol to accept hexadecimal addresses
        perf report/top TUI: Fix title line formatting
        perf top: Support hotkey to change sort order
        perf top: Support --group-sort-idx to change the sort order
        perf symbols: Fix arm64 gap between kernel start and module end
        perf build-test: Honour JOBS to override detection of number of cores
        perf script: Add --show-cgroup-events option
        perf top: Add --all-cgroups option
        perf record: Add --all-cgroups option
        perf record: Support synthesizing cgroup events
        perf report: Add 'cgroup' sort key
        perf cgroup: Maintain cgroup hierarchy
        perf tools: Basic support for CGROUP event
        ...
      c48b0722
    • Linus Torvalds's avatar
      Merge tag 'timers-urgent-2020-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d5ca3273
      Linus Torvalds authored
      Pull timer fixes from Thomas Gleixner:
       "Two timer subsystem fixes:
      
         - Prevent a use after free in the new lockdep state tracking for
           hrtimers
      
         - Add missing parenthesis in the VF pit timer driver"
      
      * tag 'timers-urgent-2020-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        clocksource/drivers/timer-vf-pit: Add missing parenthesis
        hrtimer: Don't dereference the hrtimer pointer after the callback
      d5ca3273
    • Linus Torvalds's avatar
      Merge tag 'irq-urgent-2020-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e5adbd6e
      Linus Torvalds authored
      Pull irq fixes from Thomas Gleixner:
       "Two reverts addressing regressions of the Xilinx interrupt controller
        driver which affected the PPC users"
      
      * tag 'irq-urgent-2020-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        Revert "irqchip/xilinx: Enable generic irq multi handler"
        Revert "irqchip/xilinx: Do not call irq_set_default_host()"
      e5adbd6e
    • Linus Torvalds's avatar
      sysfs: remove redundant __compat_only_sysfs_link_entry_to_kobj fn · 70fbdfef
      Linus Torvalds authored
      Commit 9255782f ("sysfs: Wrap __compat_only_sysfs_link_entry_to_kobj
      function to change the symlink name") made this function a wrapper
      around a new non-underscored function, which is a bit odd.  The normal
      naming convention is the other way around: the underscored function is
      the wrappee, and the non-underscored function is the wrapper.
      
      There's only one single user (well, two call-sites in that user) of the
      more limited double underscore version of this function, so just remove
      the oddly named wrapper entirely and just add the extra NULL argument to
      the user.
      
      I considered just doing that in the merge, but that tends to make
      history really hard to read.
      
      Link: https://lore.kernel.org/lkml/CAHk-=wgkkmNV5tMzQDmPAQuNJBuMcry--Jb+h8H1o4RA3kF7QQ@mail.gmail.com/
      
      
      Cc: Sourabh Jain <sourabhjain@linux.ibm.com>
      Cc: Michael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      70fbdfef
    • Linus Torvalds's avatar
      Merge tag 'powerpc-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · d38c07af
      Linus Torvalds authored
      Pull powerpc updates from Michael Ellerman:
       "Slightly late as I had to rebase mid-week to insert a bug fix:
      
         - A large series from Nick for 64-bit to further rework our exception
           vectors, and rewrite portions of the syscall entry/exit and
           interrupt return in C. The result is much easier to follow code
           that is also faster in general.
      
         - Cleanup of our ptrace code to split various parts out that had
           become badly intertwined with #ifdefs over the years.
      
         - Changes to our NUMA setup under the PowerVM hypervisor which should
           hopefully avoid non-sensical topologies which can lead to warnings
           from the workqueue code and other problems.
      
         - MAINTAINERS updates to remove some of our old orphan entries and
           update the status of others.
      
         - Quite a few other small changes and fixes all over the map.
      
        Thanks to: Abdul Haleem, afzal mohammed, Alexey Kardashevskiy, Andrew
        Donnellan, Aneesh Kumar K.V, Balamuruhan S, Cédric Le Goater, Chen
        Zhou, Christophe JAILLET, Christophe Leroy, Christoph Hellwig, Clement
        Courbet, Daniel Axtens, David Gibson, Douglas Miller, Fabiano Rosas,
        Fangrui Song, Ganesh Goudar, Gautham R. Shenoy, Greg Kroah-Hartman,
        Greg Kurz, Gustavo Luiz Duarte, Hari Bathini, Ilie Halip, Jan Kara,
        Joe Lawrence, Joe Perches, Kajol Jain, Larry Finger, Laurentiu Tudor,
        Leonardo Bras, Libor Pechacek, Madhavan Srinivasan, Mahesh Salgaonkar,
        Masahiro Yamada, Masami Hiramatsu, Mauricio Faria de Oliveira, Michael
        Neuling, Michal Suchanek, Mike Rapoport, Nageswara R Sastry, Nathan
        Chancellor, Nathan Lynch, Naveen N. Rao, Nicholas Piggin, Nick
        Desaulniers, Oliver O'Halloran, Po-Hsu Lin, Pratik Rajesh Sampat,
        Rasmus Villemoes, Ravi Bangoria, Roman Bolshakov, Sam Bobroff,
        Sandipan Das, Santosh S, Sedat Dilek, Segher Boessenkool, Shilpasri G
        Bhat, Sourabh Jain, Srikar Dronamraju, Stephen Rothwell, Tyrel
        Datwyler, Vaibhav Jain, YueHaibing"
      
      * tag 'powerpc-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (158 commits)
        powerpc: Make setjmp/longjmp signature standard
        powerpc/cputable: Remove unnecessary copy of cpu_spec->oprofile_type
        powerpc: Suppress .eh_frame generation
        powerpc: Drop -fno-dwarf2-cfi-asm
        powerpc/32: drop unused ISA_DMA_THRESHOLD
        powerpc/powernv: Add documentation for the opal sensor_groups sysfs interfaces
        selftests/powerpc: Fix try-run when source tree is not writable
        powerpc/vmlinux.lds: Explicitly retain .gnu.hash
        powerpc/ptrace: move ptrace_triggered() into hw_breakpoint.c
        powerpc/ptrace: create ppc_gethwdinfo()
        powerpc/ptrace: create ptrace_get_debugreg()
        powerpc/ptrace: split out ADV_DEBUG_REGS related functions.
        powerpc/ptrace: move register viewing functions out of ptrace.c
        powerpc/ptrace: split out TRANSACTIONAL_MEM related functions.
        powerpc/ptrace: split out SPE related functions.
        powerpc/ptrace: split out ALTIVEC related functions.
        powerpc/ptrace: split out VSX related functions.
        powerpc/ptrace: drop PARAMETER_SAVE_AREA_OFFSET
        powerpc/ptrace: drop unnecessary #ifdefs CONFIG_PPC64
        powerpc/ptrace: remove unused header includes
        ...
      d38c07af