1. 26 Feb, 2021 23 commits
  2. 25 Feb, 2021 17 commits
    • Linus Torvalds's avatar
      Merge tag 'pwm/for-5.12-rc1' of... · 2c87f7a3
      Linus Torvalds authored
      Merge tag 'pwm/for-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "The ZTE ZX platform is being removed, so the PWM driver is no longer
        needed and removed as well.
      
        Other than that this contains a small set of fixes and cleanups across
        a couple of drivers"
      
      * tag 'pwm/for-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: lpc18xx-sct: remove unneeded semicolon
        pwm: iqs620a: Correct a stale state variable
        pwm: iqs620a: Fix overflow and optimize calculations
        pwm: rockchip: Enable clock before calling clk_get_rate()
        pwm: rockchip: Eliminate potential race condition when probing
        pwm: rockchip: Replace "bus clk" with "PWM clk"
        pwm: rockchip: rockchip_pwm_probe(): Remove superfluous clk_unprepare()
        pwm: rockchip: Enable APB clock during register access while probing
        pwm: Remove ZTE ZX driver
      2c87f7a3
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · ffc17596
      Linus Torvalds authored
      Pull virtio updates from Michael Tsirkin:
      
       - new vdpa features to allow creation and deletion of new devices
      
       - virtio-blk support per-device queue depth
      
       - fixes, cleanups all over the place
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (31 commits)
        virtio-input: add multi-touch support
        virtio_mmio: fix one typo
        vdpa/mlx5: fix param validation in mlx5_vdpa_get_config()
        virtio_net: Fix fall-through warnings for Clang
        virtio_input: Prevent EV_MSC/MSC_TIMESTAMP loop storm for MT.
        virtio-blk: support per-device queue depth
        virtio_vdpa: don't warn when fail to disable vq
        virtio-pci: introduce modern device module
        virito-pci-modern: rename map_capability() to vp_modern_map_capability()
        virtio-pci-modern: introduce helper to get notification offset
        virtio-pci-modern: introduce helper for getting queue nums
        virtio-pci-modern: introduce helper for setting/geting queue size
        virtio-pci-modern: introduce helper to set/get queue_enable
        virtio-pci-modern: introduce vp_modern_queue_address()
        virtio-pci-modern: introduce vp_modern_set_queue_vector()
        virtio-pci-modern: introduce vp_modern_generation()
        virtio-pci-modern: introduce helpers for setting and getting features
        virtio-pci-modern: introduce helpers for setting and getting status
        virtio-pci-modern: introduce helper to set config vector
        virtio-pci-modern: introduce vp_modern_remove()
        ...
      ffc17596
    • Linus Torvalds's avatar
      Merge tag 'mips_5.12_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux · a6525b99
      Linus Torvalds authored
      Pull more MIPS updates from Thomas Bogendoerfer:
      
       - added n64 block driver
      
       - fix for ubsan warnings
      
       - fix for bcm63xx platform
      
       - update of linux-mips mailinglist
      
      * tag 'mips_5.12_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
        arch: mips: update references to current linux-mips list
        mips: bmips: init clocks earlier
        vmlinux.lds.h: catch even more instrumentation symbols into .data
        n64: store dev instance into disk private data
        n64: cleanup n64cart_probe()
        n64: cosmetics changes
        n64: remove curly brackets
        n64: use sector SECTOR_SHIFT instead 512
        n64: use enums for reg
        n64: move module param at the top
        n64: move module info at the end
        n64: use pr_fmt to avoid duplicate string
        block: Add n64 cart driver
      a6525b99
    • Linus Torvalds's avatar
      Merge tag 'drm-next-2021-02-26' of git://anongit.freedesktop.org/drm/drm · fdce2960
      Linus Torvalds authored
      Pull more drm updates from Dave Airlie:
       "This is mostly fixes but I missed msm-next pull last week. It's been
        in drm-next.
      
        Otherwise it's a selection of i915, amdgpu and misc fixes, one TTM
        memory leak, nothing really major stands out otherwise.
      
        core:
         - vblank fence timing improvements
      
        dma-buf:
         - improve error handling
      
        ttm:
         - memory leak fix
      
        msm:
         - a6xx speedbin support
         - a508, a509, a512 support
         - various a5xx fixes
         - various dpu fixes
         - qseed3lite support for sm8250
         - dsi fix for msm8994
         - mdp5 fix for framerate bug with cmd mode panels
         - a6xx GMU OOB race fixes that were showing up in CI
         - various addition and removal of semicolons
         - gem submit fix for legacy userspace relocs path
      
        amdgpu:
         - clang warning fix
         - S0ix platform shutdown/poweroff fix
         - misc display fixes
      
        i915:
         - color format fix
         - -Wuninitialised reenabled
         - GVT ww locking, cmd parser fixes
      
        atyfb:
         - fix build
      
        rockchip:
         - AFBC modifier fix"
      
      * tag 'drm-next-2021-02-26' of git://anongit.freedesktop.org/drm/drm: (60 commits)
        drm/panel: kd35t133: allow using non-continuous dsi clock
        drm/rockchip: Require the YTR modifier for AFBC
        drm/ttm: Fix a memory leak
        drm/drm_vblank: set the dma-fence timestamp during send_vblank_event
        dma-fence: allow signaling drivers to set fence timestamp
        dma-buf: heaps: Rework heap allocation hooks to return struct dma_buf instead of fd
        dma-buf: system_heap: Make sure to return an error if we abort
        drm/amd/display: Fix system hang after multiple hotplugs (v3)
        drm/amdgpu: fix shutdown and poweroff process failed with s0ix
        drm/i915: Nuke INTEL_OUTPUT_FORMAT_INVALID
        drm/i915: Enable -Wuninitialized
        drm/amd/display: Remove Assert from dcn10_get_dig_frontend
        drm/amd/display: Add vupdate_no_lock interrupts for DCN2.1
        Revert "drm/amd/display: reuse current context instead of recreating one"
        drm/amd/pm/swsmu: Avoid using structure_size uninitialized in smu_cmn_init_soft_gpu_metrics
        fbdev: atyfb: add stubs for aty_{ld,st}_lcd()
        drm/i915/gvt: Introduce per object locking in GVT scheduler.
        drm/i915/gvt: Purge dev_priv->gt
        drm/i915/gvt: Parse default state to update reg whitelist
        dt-bindings: dp-connector: Drop maxItems from -supply
        ...
      fdce2960
    • Linus Torvalds's avatar
      Merge tag 'net-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 5ad3dbab
      Linus Torvalds authored
      Pull networking fixes from Jakub Kicinski:
       "Rather small batch this time.
      
        Current release - regressions:
      
         - bcm63xx_enet: fix sporadic kernel panic due to queue length
           mis-accounting
      
        Current release - new code bugs:
      
         - bcm4908_enet: fix RX path possible mem leak
      
         - bcm4908_enet: fix NAPI poll returned value
      
         - stmmac: fix missing spin_lock_init in visconti_eth_dwmac_probe()
      
         - sched: cls_flower: validate ct_state for invalid and reply flags
      
        Previous releases - regressions:
      
         - net: introduce CAN specific pointer in the struct net_device to
           prevent mis-interpreting memory
      
         - phy: micrel: set soft_reset callback to genphy_soft_reset for
           KSZ8081
      
         - psample: fix netlink skb length with tunnel info
      
        Previous releases - always broken:
      
         - icmp: pass zeroed opts from icmp{,v6}_ndo_send before sending
      
         - wireguard: device: do not generate ICMP for non-IP packets
      
         - mptcp: provide subflow aware release function to avoid a mem leak
      
         - hsr: add support for EntryForgetTime
      
         - r8169: fix jumbo packet handling on RTL8168e
      
         - octeontx2-af: fix an off by one in rvu_dbg_qsize_write()
      
         - i40e: fix flow for IPv6 next header (extension header)
      
         - phy: icplus: call phy_restore_page() when phy_select_page() fails
      
         - dpaa_eth: fix the access method for the dpaa_napi_portal"
      
      * tag 'net-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (55 commits)
        r8169: fix jumbo packet handling on RTL8168e
        net: phy: micrel: set soft_reset callback to genphy_soft_reset for KSZ8081
        net: psample: Fix netlink skb length with tunnel info
        net: broadcom: bcm4908_enet: fix NAPI poll returned value
        net: broadcom: bcm4908_enet: fix RX path possible mem leak
        net: hsr: add support for EntryForgetTime
        net: dsa: sja1105: Remove unneeded cast in sja1105_crc32()
        ibmvnic: fix a race between open and reset
        net: stmmac: Fix missing spin_lock_init in visconti_eth_dwmac_probe()
        net: introduce CAN specific pointer in the struct net_device
        net: usb: qmi_wwan: support ZTE P685M modem
        wireguard: kconfig: use arm chacha even with no neon
        wireguard: queueing: get rid of per-peer ring buffers
        wireguard: device: do not generate ICMP for non-IP packets
        wireguard: peer: put frequently used members above cache lines
        wireguard: selftests: test multiple parallel streams
        wireguard: socket: remove bogus __be32 annotation
        wireguard: avoid double unlikely() notation when using IS_ERR()
        net: qrtr: Fix memory leak in qrtr_tun_open
        vxlan: move debug check after netdev unregister
        ...
      5ad3dbab
    • Linus Torvalds's avatar
      Merge tag 'acpi-5.12-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 268f77b5
      Linus Torvalds authored
      Pull more ACPI updates from Rafael Wysocki:
       "These make additional changes to the platform profile interface merged
        recently and add support for the FPDT ACPI table.
      
        Specifics:
      
         - Rearrange Kconfig handling of ACPI_PLATFORM_PROFILE, add
           "balanced-performance" to the list of supported platform profiles
           and fix up some file references in a comment (Maximilian Luz).
      
         - Add support for parsing the ACPI Firmware Performance Data Table
           (FPDT) and exposing the data from there via sysfs (Zhang Rui)"
      
      * tag 'acpi-5.12-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: platform: Add balanced-performance platform profile
        ACPI: platform: Fix file references in comment
        ACPI: platform: Hide ACPI_PLATFORM_PROFILE option
        ACPI: tables: introduce support for FPDT table
      268f77b5
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-fixes-2021-02-25' of... · d153e8c1
      Dave Airlie authored
      Merge tag 'drm-intel-next-fixes-2021-02-25' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
      
      A fix for color format check from Ville, plus the re-enable of -Wuninitialized
      from Nathan, and the GVT fixes including fixes for ww locking, cmd parser and
      a general cleanup of dev_priv->gt.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      
      From: Rodrigo Vivi <rodrigo.vivi@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/YDe3pBPV5Kx3hpk6@intel.com
      d153e8c1
    • Dave Airlie's avatar
      Merge tag 'amd-drm-fixes-5.12-2021-02-24' of... · 9c712c9c
      Dave Airlie authored
      Merge tag 'amd-drm-fixes-5.12-2021-02-24' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
      
      amd-drm-fixes-5.12-2021-02-24:
      
      amdgpu:
      - Clang warning fix
      - S0ix platform shutdown/poweroff fix
      - Misc display fixes
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      From: Alex Deucher <alexander.deucher@amd.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20210225043853.3880-1-alexander.deucher@amd.com
      9c712c9c
    • Dave Airlie's avatar
      Merge tag 'drm-misc-next-fixes-2021-02-25' of... · e81df5bc
      Dave Airlie authored
      Merge tag 'drm-misc-next-fixes-2021-02-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
      
      drm-misc-next tasty fixes for v5.12:
      - Cherry pick of drm-misc-fixes pull:
      "here's this week's PR for drm-misc-fixes. One of the patches is a memory
      leak; the rest is for hardware issues."
      - Fix dt bindings for dp connector.
      - Fix build error in atyfb.
      - Improve error handling for dma-buf heaps.
      - Make vblank timestamp more correct, by recording timestamp to be set when signaling.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      
      From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/0f60a68c-d562-7266-0815-ea75ff680b17@linux.intel.com
      e81df5bc
    • Linus Torvalds's avatar
      Merge tag 'kbuild-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 6fbd6cf8
      Linus Torvalds authored
      Pull Kbuild updates from Masahiro Yamada:
      
       - Fix false-positive build warnings for ARCH=ia64 builds
      
       - Optimize dictionary size for module compression with xz
      
       - Check the compiler and linker versions in Kconfig
      
       - Fix misuse of extra-y
      
       - Support DWARF v5 debug info
      
       - Clamp SUBLEVEL to 255 because stable releases 4.4.x and 4.9.x
         exceeded the limit
      
       - Add generic syscall{tbl,hdr}.sh for cleanups across arches
      
       - Minor cleanups of genksyms
      
       - Minor cleanups of Kconfig
      
      * tag 'kbuild-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (38 commits)
        initramfs: Remove redundant dependency of RD_ZSTD on BLK_DEV_INITRD
        kbuild: remove deprecated 'always' and 'hostprogs-y/m'
        kbuild: parse C= and M= before changing the working directory
        kbuild: reuse this-makefile to define abs_srctree
        kconfig: unify rule of config, menuconfig, nconfig, gconfig, xconfig
        kconfig: omit --oldaskconfig option for 'make config'
        kconfig: fix 'invalid option' for help option
        kconfig: remove dead code in conf_askvalue()
        kconfig: clean up nested if-conditionals in check_conf()
        kconfig: Remove duplicate call to sym_get_string_value()
        Makefile: Remove # characters from compiler string
        Makefile: reuse CC_VERSION_TEXT
        kbuild: check the minimum linker version in Kconfig
        kbuild: remove ld-version macro
        scripts: add generic syscallhdr.sh
        scripts: add generic syscalltbl.sh
        arch: syscalls: remove $(srctree)/ prefix from syscall tables
        arch: syscalls: add missing FORCE and fix 'targets' to make if_changed work
        gen_compile_commands: prune some directories
        kbuild: simplify access to the kernel's version
        ...
      6fbd6cf8
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 6f9972bb
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "Miscellaneous ext4 cleanups and bug fixes. Pretty boring this cycle..."
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: add .kunitconfig fragment to enable ext4-specific tests
        ext: EXT4_KUNIT_TESTS should depend on EXT4_FS instead of selecting it
        ext4: reset retry counter when ext4_alloc_file_blocks() makes progress
        ext4: fix potential htree index checksum corruption
        ext4: factor out htree rep invariant check
        ext4: Change list_for_each* to list_for_each_entry*
        ext4: don't try to processed freed blocks until mballoc is initialized
        ext4: use DEFINE_MUTEX() for mutex lock
      6f9972bb
    • Rafael J. Wysocki's avatar
      Merge branch 'acpi-tables' · b11ffaea
      Rafael J. Wysocki authored
      * acpi-tables:
        ACPI: tables: introduce support for FPDT table
      b11ffaea
    • Linus Torvalds's avatar
      Merge tag 'pci-v5.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 5b47b10e
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
       "Enumeration:
         - Remove unnecessary locking around _OSC (Bjorn Helgaas)
         - Clarify message about _OSC failure (Bjorn Helgaas)
         - Remove notification of PCIe bandwidth changes (Bjorn Helgaas)
         - Tidy checking of syscall user config accessors (Heiner Kallweit)
      
        Resource management:
         - Decline to resize resources if boot config must be preserved (Ard
           Biesheuvel)
         - Fix pci_register_io_range() memory leak (Geert Uytterhoeven)
      
        Error handling (Keith Busch):
         - Clear error status from the correct device
         - Retain error recovery status so drivers can use it after reset
         - Log the type of Port (Root or Switch Downstream) that we reset
         - Always request a reset for Downstream Ports in frozen state
      
        Endpoint framework and NTB (Kishon Vijay Abraham I):
         - Make *_get_first_free_bar() take into account 64 bit BAR
         - Add helper API to get the 'next' unreserved BAR
         - Make *_free_bar() return error codes on failure
         - Remove unused pci_epf_match_device()
         - Add support to associate secondary EPC with EPF
         - Add support in configfs to associate two EPCs with EPF
         - Add pci_epc_ops to map MSI IRQ
         - Add pci_epf_ops to expose function-specific attrs
         - Allow user to create sub-directory of 'EPF Device' directory
         - Implement ->msi_map_irq() ops for cadence
         - Configure LM_EP_FUNC_CFG based on epc->function_num_map for cadence
         - Add EP function driver to provide NTB functionality
         - Add support for EPF PCI Non-Transparent Bridge
         - Add specification for PCI NTB function device
         - Add PCI endpoint NTB function user guide
         - Add configfs binding documentation for pci-ntb endpoint function
      
        Broadcom STB PCIe controller driver:
         - Add support for BCM4908 and external PERST# signal controller
           (Rafał Miłecki)
      
        Cadence PCIe controller driver:
         - Retrain Link to work around Gen2 training defect (Nadeem Athani)
         - Fix merge botch in cdns_pcie_host_map_dma_ranges() (Krzysztof
           Wilczyński)
      
        Freescale Layerscape PCIe controller driver:
         - Add LX2160A rev2 EP mode support (Hou Zhiqiang)
         - Convert to builtin_platform_driver() (Michael Walle)
      
        MediaTek PCIe controller driver:
         - Fix OF node reference leak (Krzysztof Wilczyński)
      
        Microchip PolarFlare PCIe controller driver:
         - Add Microchip PolarFire PCIe controller driver (Daire McNamara)
      
        Qualcomm PCIe controller driver:
         - Use PHY_REFCLK_USE_PAD only for ipq8064 (Ansuel Smith)
         - Add support for ddrss_sf_tbu clock for sm8250 (Dmitry Baryshkov)
      
        Renesas R-Car PCIe controller driver:
         - Drop PCIE_RCAR config option (Lad Prabhakar)
         - Always allocate MSI addresses in 32bit space (Marek Vasut)
      
        Rockchip PCIe controller driver:
         - Add FriendlyARM NanoPi M4B DT binding (Chen-Yu Tsai)
         - Make 'ep-gpios' DT property optional (Chen-Yu Tsai)
      
        Synopsys DesignWare PCIe controller driver:
         - Work around ECRC configuration hardware defect (Vidya Sagar)
         - Drop support for config space in DT 'ranges' (Rob Herring)
         - Change size to u64 for EP outbound iATU (Shradha Todi)
         - Add upper limit address for outbound iATU (Shradha Todi)
         - Make dw_pcie ops optional (Jisheng Zhang)
         - Remove unnecessary dw_pcie_ops from al driver (Jisheng Zhang)
      
        Xilinx Versal CPM PCIe controller driver:
         - Fix OF node reference leak (Pan Bian)
      
        Miscellaneous:
         - Remove tango host controller driver (Arnd Bergmann)
         - Remove IRQ handler & data together (altera-msi, brcmstb, dwc)
           (Martin Kaiser)
         - Fix xgene-msi race in installing chained IRQ handler (Martin
           Kaiser)
         - Apply CONFIG_PCI_DEBUG to entire drivers/pci hierarchy (Junhao He)
         - Fix pci-bridge-emul array overruns (Russell King)
         - Remove obsolete uses of WARN_ON(in_interrupt()) (Sebastian Andrzej
           Siewior)"
      
      * tag 'pci-v5.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (69 commits)
        PCI: qcom: Use PHY_REFCLK_USE_PAD only for ipq8064
        PCI: qcom: Add support for ddrss_sf_tbu clock
        dt-bindings: PCI: qcom: Document ddrss_sf_tbu clock for sm8250
        PCI: al: Remove useless dw_pcie_ops
        PCI: dwc: Don't assume the ops in dw_pcie always exist
        PCI: dwc: Add upper limit address for outbound iATU
        PCI: dwc: Change size to u64 for EP outbound iATU
        PCI: dwc: Drop support for config space in 'ranges'
        PCI: layerscape: Convert to builtin_platform_driver()
        PCI: layerscape: Add LX2160A rev2 EP mode support
        dt-bindings: PCI: layerscape: Add LX2160A rev2 compatible strings
        PCI: dwc: Work around ECRC configuration issue
        PCI/portdrv: Report reset for frozen channel
        PCI/AER: Specify the type of Port that was reset
        PCI/ERR: Retain status from error notification
        PCI/AER: Clear AER status from Root Port when resetting Downstream Port
        PCI/ERR: Clear status of the reporting device
        dt-bindings: arm: rockchip: Add FriendlyARM NanoPi M4B
        PCI: rockchip: Make 'ep-gpios' DT property optional
        Documentation: PCI: Add PCI endpoint NTB function user guide
        ...
      5b47b10e
    • Heiner Kallweit's avatar
      r8169: fix jumbo packet handling on RTL8168e · 6cf73913
      Heiner Kallweit authored
      Josef reported [0] that using jumbo packets fails on RTL8168e.
      Aligning the values for register MaxTxPacketSize with the
      vendor driver fixes the problem.
      
      [0] https://bugzilla.kernel.org/show_bug.cgi?id=211827
      
      Fixes: d58d46b5 ("r8169: jumbo fixes.")
      Reported-by: default avatarJosef Oškera <joskera@redhat.com>
      Tested-by: default avatarJosef Oškera <joskera@redhat.com>
      Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
      Link: https://lore.kernel.org/r/b15ddef7-0d50-4320-18f4-6a3f86fbfd3e@gmail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      6cf73913
    • Christian Melki's avatar
      net: phy: micrel: set soft_reset callback to genphy_soft_reset for KSZ8081 · 764d31ca
      Christian Melki authored
      Following a similar reinstate for the KSZ9031.
      
      Older kernels would use the genphy_soft_reset if the PHY did not implement
      a .soft_reset.
      
      Bluntly removing that default may expose a lot of situations where various
      PHYs/board implementations won't recover on various changes.
      Like with this implementation during a 4.9.x to 5.4.x LTS transition.
      I think it's a good thing to remove unwanted soft resets but wonder if it
      did open a can of worms?
      
      Atleast this fixes one iMX6 FEC/RMII/8081 combo.
      
      Fixes: 6e2d85ec ("net: phy: Stop with excessive soft reset")
      Signed-off-by: default avatarChristian Melki <christian.melki@t2data.com>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Link: https://lore.kernel.org/r/20210224205536.9349-1-christian.melki@t2data.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      764d31ca
    • Linus Torvalds's avatar
      Merge tag 'nds32-for-linux-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux · 6c15f9e8
      Linus Torvalds authored
      Pull nds32 updates from Greentime Hu:
       "Code clean-up and refinement"
      
      * tag 'nds32-for-linux-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux:
        nds32: Fix bogus reference to <asm/procinfo.h>
        nds32: use get_kernel_nofault in dump_mem
        nds32: remove dump_instr
        nds32: configs: Cleanup CONFIG_CROSS_COMPILE
        nds32: Replace <linux/clk-provider.h> by <linux/of_clk.h>
      6c15f9e8
    • Chris Mi's avatar
      net: psample: Fix netlink skb length with tunnel info · a93dcaad
      Chris Mi authored
      Currently, the psample netlink skb is allocated with a size that does
      not account for the nested 'PSAMPLE_ATTR_TUNNEL' attribute and the
      padding required for the 64-bit attribute 'PSAMPLE_TUNNEL_KEY_ATTR_ID'.
      This can result in failure to add attributes to the netlink skb due
      to insufficient tail room. The following error message is printed to
      the kernel log: "Could not create psample log message".
      
      Fix this by adjusting the allocation size to take into account the
      nested attribute and the padding.
      
      Fixes: d8bed686 ("net: psample: Add tunnel support")
      CC: Yotam Gigi <yotam.gi@gmail.com>
      Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
      Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
      Signed-off-by: default avatarChris Mi <cmi@nvidia.com>
      Link: https://lore.kernel.org/r/20210225075145.184314-1-cmi@nvidia.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      a93dcaad