Merge tag 'v5.10.31' into lf-5.10.y
authorJason Liu <jason.hui.liu@nxp.com>
Mon, 19 Apr 2021 02:20:13 +0000 (10:20 +0800)
committerJason Liu <jason.hui.liu@nxp.com>
Mon, 19 Apr 2021 02:20:13 +0000 (10:20 +0800)
commit5b9c4ea05480c30e744fe3b10d17bfd69426f3e3
treeabad0d6cd4ac35252ee1b0079464dc548315a11a
parentfe4ded7117ef043f26b6d3cb1397c7833cfd744a
parent65f1995ea1e930674e76c5888b4643581e11434c
Merge tag 'v5.10.31' into lf-5.10.y

This is the 5.10.31 stable release

* tag 'v5.10.31': (213 commits)
  Linux 5.10.31
  xen/events: fix setting irq affinity
  net: sfp: cope with SFPs that set both LOS normal and LOS inverted
  ...

Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
 Conflicts:
drivers/gpu/drm/imx/imx-ldb.c
Documentation/devicetree/bindings/net/ethernet-controller.yaml
arch/arm64/boot/dts/freescale/imx8mq-pinfunc.h
arch/arm64/kernel/cpufeature.c
drivers/base/dd.c
drivers/clk/clk.c
drivers/gpu/drm/imx/imx-ldb.c
sound/soc/codecs/wm8960.c