]> www.infradead.org Git - users/jedix/linux-maple.git/log
users/jedix/linux-maple.git
3 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 2 Sep 2021 01:22:58 +0000 (11:22 +1000)]
Merge remote-tracking branch 'modules/modules-next'

3 years agoMerge remote-tracking branch 'imx-drm/imx-drm/next'
Stephen Rothwell [Thu, 2 Sep 2021 01:20:50 +0000 (11:20 +1000)]
Merge remote-tracking branch 'imx-drm/imx-drm/next'

3 years agoMerge remote-tracking branch 'amdgpu/drm-next'
Stephen Rothwell [Thu, 2 Sep 2021 01:20:50 +0000 (11:20 +1000)]
Merge remote-tracking branch 'amdgpu/drm-next'

# Conflicts:
# drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c

3 years agoMerge remote-tracking branch 'drm-misc/for-linux-next'
Stephen Rothwell [Thu, 2 Sep 2021 01:11:54 +0000 (11:11 +1000)]
Merge remote-tracking branch 'drm-misc/for-linux-next'

3 years agoMerge remote-tracking branch 'nand/nand/next'
Stephen Rothwell [Thu, 2 Sep 2021 01:10:14 +0000 (11:10 +1000)]
Merge remote-tracking branch 'nand/nand/next'

3 years agoMerge remote-tracking branch 'mtd/mtd/next'
Stephen Rothwell [Thu, 2 Sep 2021 01:08:36 +0000 (11:08 +1000)]
Merge remote-tracking branch 'mtd/mtd/next'

3 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 2 Sep 2021 01:06:53 +0000 (11:06 +1000)]
Merge remote-tracking branch 'bluetooth/master'

3 years agoMerge remote-tracking branch 'rdma/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:55:10 +0000 (10:55 +1000)]
Merge remote-tracking branch 'rdma/for-next'

3 years agoMerge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:40:19 +0000 (10:40 +1000)]
Merge remote-tracking branch 'swiotlb/linux-next'

# Conflicts:
# kernel/dma/direct.c

3 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Thu, 2 Sep 2021 00:38:43 +0000 (10:38 +1000)]
Merge remote-tracking branch 'dlm/next'

3 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:37:06 +0000 (10:37 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

3 years agoMerge remote-tracking branch 'thermal/thermal/linux-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:34:51 +0000 (10:34 +1000)]
Merge remote-tracking branch 'thermal/thermal/linux-next'

3 years agoMerge remote-tracking branch 'cpupower/cpupower'
Stephen Rothwell [Thu, 2 Sep 2021 00:33:16 +0000 (10:33 +1000)]
Merge remote-tracking branch 'cpupower/cpupower'

3 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:30:43 +0000 (10:30 +1000)]
Merge remote-tracking branch 'pm/linux-next'

3 years agoMerge remote-tracking branch 'v4l-dvb-next/master'
Stephen Rothwell [Thu, 2 Sep 2021 00:28:31 +0000 (10:28 +1000)]
Merge remote-tracking branch 'v4l-dvb-next/master'

3 years agoMerge remote-tracking branch 'jc_docs/docs-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:27:17 +0000 (10:27 +1000)]
Merge remote-tracking branch 'jc_docs/docs-next'

3 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:27:16 +0000 (10:27 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'

3 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:25:36 +0000 (10:25 +1000)]
Merge remote-tracking branch 'hid/for-next'

3 years agoMerge remote-tracking branch 'pstore/for-next/pstore'
Stephen Rothwell [Thu, 2 Sep 2021 00:23:59 +0000 (10:23 +1000)]
Merge remote-tracking branch 'pstore/for-next/pstore'

3 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Thu, 2 Sep 2021 00:10:47 +0000 (10:10 +1000)]
Merge remote-tracking branch 'pci/next'

# Conflicts:
# MAINTAINERS
# drivers/net/ethernet/broadcom/bnx2.c
# drivers/net/ethernet/broadcom/bnxt/bnxt.c

3 years agoMerge remote-tracking branch 'printk/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:55:20 +0000 (09:55 +1000)]
Merge remote-tracking branch 'printk/for-next'

# Conflicts:
# MAINTAINERS

3 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:59 +0000 (09:39 +1000)]
Merge remote-tracking branch 'vfs/for-next'

3 years agoMerge remote-tracking branch 'zonefs/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:58 +0000 (09:39 +1000)]
Merge remote-tracking branch 'zonefs/for-next'

3 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:56 +0000 (09:39 +1000)]
Merge remote-tracking branch 'xfs/for-next'

3 years agoMerge remote-tracking branch 'v9fs/9p-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:55 +0000 (09:39 +1000)]
Merge remote-tracking branch 'v9fs/9p-next'

3 years agoMerge remote-tracking branch 'overlayfs/overlayfs-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:53 +0000 (09:39 +1000)]
Merge remote-tracking branch 'overlayfs/overlayfs-next'

3 years agoMerge remote-tracking branch 'ntfs3/master'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:52 +0000 (09:39 +1000)]
Merge remote-tracking branch 'ntfs3/master'

3 years agoMerge remote-tracking branch 'cel/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:51 +0000 (09:39 +1000)]
Merge remote-tracking branch 'cel/for-next'

3 years agoMerge remote-tracking branch 'nfs-anna/linux-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:50 +0000 (09:39 +1000)]
Merge remote-tracking branch 'nfs-anna/linux-next'

3 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:49 +0000 (09:39 +1000)]
Merge remote-tracking branch 'fuse/for-next'

3 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:48 +0000 (09:39 +1000)]
Merge remote-tracking branch 'f2fs/dev'

3 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:45 +0000 (09:39 +1000)]
Merge remote-tracking branch 'ext4/dev'

3 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:43 +0000 (09:39 +1000)]
Merge remote-tracking branch 'ext3/for_next'

3 years agoMerge remote-tracking branch 'erofs/dev'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:41 +0000 (09:39 +1000)]
Merge remote-tracking branch 'erofs/dev'

3 years agoMerge remote-tracking branch 'configfs/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:40 +0000 (09:39 +1000)]
Merge remote-tracking branch 'configfs/for-next'

3 years agoMerge remote-tracking branch 'btrfs/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:40 +0000 (09:39 +1000)]
Merge remote-tracking branch 'btrfs/for-next'

3 years agoMerge remote-tracking branch 'fscache/fscache-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:39 +0000 (09:39 +1000)]
Merge remote-tracking branch 'fscache/fscache-next'

3 years agoMerge remote-tracking branch 'pidfd/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:37 +0000 (09:39 +1000)]
Merge remote-tracking branch 'pidfd/for-next'

3 years agoMerge remote-tracking branch 'xtensa/xtensa-for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:29 +0000 (09:24 +1000)]
Merge remote-tracking branch 'xtensa/xtensa-for-next'

3 years agoMerge remote-tracking branch 'uml/linux-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:28 +0000 (09:24 +1000)]
Merge remote-tracking branch 'uml/linux-next'

3 years agoMerge remote-tracking branch 'sh/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:24 +0000 (09:24 +1000)]
Merge remote-tracking branch 'sh/for-next'

3 years agoMerge remote-tracking branch 's390/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:23 +0000 (09:24 +1000)]
Merge remote-tracking branch 's390/for-next'

3 years agoMerge remote-tracking branch 'risc-v/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:22 +0000 (09:24 +1000)]
Merge remote-tracking branch 'risc-v/for-next'

3 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:22 +0000 (09:24 +1000)]
Merge remote-tracking branch 'powerpc/next'

# Conflicts:
# arch/powerpc/sysdev/xive/common.c

3 years agoMerge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:20 +0000 (09:24 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'

3 years agoMerge remote-tracking branch 'openrisc/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:19 +0000 (09:24 +1000)]
Merge remote-tracking branch 'openrisc/for-next'

3 years agoMerge remote-tracking branch 'mips/mips-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:18 +0000 (09:24 +1000)]
Merge remote-tracking branch 'mips/mips-next'

3 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:17 +0000 (09:24 +1000)]
Merge remote-tracking branch 'microblaze/next'

3 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:16 +0000 (09:24 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

3 years agoMerge remote-tracking branch 'h8300/h8300-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:12 +0000 (09:24 +1000)]
Merge remote-tracking branch 'h8300/h8300-next'

3 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:09 +0000 (09:24 +1000)]
Merge remote-tracking branch 'clk/clk-next'

3 years agoMerge remote-tracking branch 'xilinx/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:07 +0000 (09:24 +1000)]
Merge remote-tracking branch 'xilinx/for-next'

3 years agoMerge remote-tracking branch 'ti-k3/ti-k3-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:07 +0000 (09:24 +1000)]
Merge remote-tracking branch 'ti-k3/ti-k3-next'

3 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:00 +0000 (09:24 +1000)]
Merge remote-tracking branch 'tegra/for-next'

3 years agoMerge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:57 +0000 (09:23 +1000)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'

3 years agoMerge remote-tracking branch 'scmi/for-linux-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:56 +0000 (09:23 +1000)]
Merge remote-tracking branch 'scmi/for-linux-next'

3 years agoMerge remote-tracking branch 'samsung-krzk/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:54 +0000 (09:23 +1000)]
Merge remote-tracking branch 'samsung-krzk/for-next'

3 years agoMerge remote-tracking branch 'rockchip/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:51 +0000 (09:23 +1000)]
Merge remote-tracking branch 'rockchip/for-next'

3 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:49 +0000 (09:23 +1000)]
Merge remote-tracking branch 'renesas/next'

3 years agoMerge remote-tracking branch 'raspberrypi/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:48 +0000 (09:23 +1000)]
Merge remote-tracking branch 'raspberrypi/for-next'

3 years agoMerge remote-tracking branch 'qcom/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:44 +0000 (09:23 +1000)]
Merge remote-tracking branch 'qcom/for-next'

3 years agoMerge remote-tracking branch 'omap/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:40 +0000 (09:23 +1000)]
Merge remote-tracking branch 'omap/for-next'

3 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:40 +0000 (09:23 +1000)]
Merge remote-tracking branch 'mvebu/for-next'

3 years agoMerge remote-tracking branch 'mediatek/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:38 +0000 (09:23 +1000)]
Merge remote-tracking branch 'mediatek/for-next'

3 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:38 +0000 (09:23 +1000)]
Merge remote-tracking branch 'keystone/next'

3 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:33 +0000 (09:23 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

3 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:32 +0000 (09:23 +1000)]
Merge remote-tracking branch 'at91/at91-next'

3 years agoMerge remote-tracking branch 'aspeed/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:30 +0000 (09:23 +1000)]
Merge remote-tracking branch 'aspeed/for-next'

3 years agoMerge remote-tracking branch 'amlogic/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:29 +0000 (09:23 +1000)]
Merge remote-tracking branch 'amlogic/for-next'

3 years agoMerge remote-tracking branch 'actions/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:26 +0000 (09:23 +1000)]
Merge remote-tracking branch 'actions/for-next'

3 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:26 +0000 (09:23 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

# Conflicts:
# arch/arm64/boot/dts/qcom/sc7280-idp.dts
# arch/arm64/boot/dts/qcom/sc7280.dtsi
# drivers/firmware/Makefile
# include/uapi/linux/virtio_ids.h

3 years agoMerge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:23 +0000 (09:23 +1000)]
Merge remote-tracking branch 'arm64/for-next/core'

3 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:22 +0000 (09:23 +1000)]
Merge remote-tracking branch 'arm/for-next'

3 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:23:21 +0000 (09:23 +1000)]
Merge remote-tracking branch 'arc/for-next'

3 years agoMerge remote-tracking branch 'asm-generic/master'
Stephen Rothwell [Wed, 1 Sep 2021 23:18:35 +0000 (09:18 +1000)]
Merge remote-tracking branch 'asm-generic/master'

# Conflicts:
# include/asm-generic/bitops/non-atomic.h

3 years agoMerge remote-tracking branch 'dma-mapping/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:09:25 +0000 (09:09 +1000)]
Merge remote-tracking branch 'dma-mapping/for-next'

3 years agoMerge remote-tracking branch 'compiler-attributes/compiler-attributes'
Stephen Rothwell [Wed, 1 Sep 2021 22:54:07 +0000 (08:54 +1000)]
Merge remote-tracking branch 'compiler-attributes/compiler-attributes'

# Conflicts:
# include/linux/compiler_attributes.h

3 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 22:38:54 +0000 (08:38 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

3 years agoMerge remote-tracking branch 'kspp-gustavo/for-next/kspp'
Stephen Rothwell [Wed, 1 Sep 2021 22:37:21 +0000 (08:37 +1000)]
Merge remote-tracking branch 'kspp-gustavo/for-next/kspp'

3 years agoMerge remote-tracking branch 'fpga-fixes/fixes'
Stephen Rothwell [Wed, 1 Sep 2021 22:29:34 +0000 (08:29 +1000)]
Merge remote-tracking branch 'fpga-fixes/fixes'

3 years agoMerge remote-tracking branch 'rtc-fixes/rtc-fixes'
Stephen Rothwell [Wed, 1 Sep 2021 22:29:32 +0000 (08:29 +1000)]
Merge remote-tracking branch 'rtc-fixes/rtc-fixes'

3 years agoMerge remote-tracking branch 'vfs-fixes/fixes'
Stephen Rothwell [Wed, 1 Sep 2021 22:29:29 +0000 (08:29 +1000)]
Merge remote-tracking branch 'vfs-fixes/fixes'

3 years agoMerge remote-tracking branch 'btrfs-fixes/next-fixes'
Stephen Rothwell [Wed, 1 Sep 2021 22:29:27 +0000 (08:29 +1000)]
Merge remote-tracking branch 'btrfs-fixes/next-fixes'

3 years agoMerge remote-tracking branch 'nvdimm-fixes/libnvdimm-fixes'
Stephen Rothwell [Wed, 1 Sep 2021 22:29:27 +0000 (08:29 +1000)]
Merge remote-tracking branch 'nvdimm-fixes/libnvdimm-fixes'

3 years agoMerge remote-tracking branch 'omap-fixes/fixes'
Stephen Rothwell [Wed, 1 Sep 2021 22:29:26 +0000 (08:29 +1000)]
Merge remote-tracking branch 'omap-fixes/fixes'

3 years agoMerge remote-tracking branch 'iio-fixes/fixes-togreg'
Stephen Rothwell [Wed, 1 Sep 2021 22:29:24 +0000 (08:29 +1000)]
Merge remote-tracking branch 'iio-fixes/fixes-togreg'

3 years agoMerge remote-tracking branch 'usb-serial-fixes/usb-linus'
Stephen Rothwell [Wed, 1 Sep 2021 22:29:23 +0000 (08:29 +1000)]
Merge remote-tracking branch 'usb-serial-fixes/usb-linus'

3 years agoMerge remote-tracking branch 'regulator-fixes/for-linus'
Stephen Rothwell [Wed, 1 Sep 2021 22:29:21 +0000 (08:29 +1000)]
Merge remote-tracking branch 'regulator-fixes/for-linus'

3 years agoMerge remote-tracking branch 'sound-asoc-fixes/for-linus'
Stephen Rothwell [Wed, 1 Sep 2021 22:29:20 +0000 (08:29 +1000)]
Merge remote-tracking branch 'sound-asoc-fixes/for-linus'

3 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Wed, 1 Sep 2021 22:29:19 +0000 (08:29 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'

3 years agoMerge remote-tracking branch 'netfilter/master'
Stephen Rothwell [Wed, 1 Sep 2021 22:29:18 +0000 (08:29 +1000)]
Merge remote-tracking branch 'netfilter/master'

3 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Wed, 1 Sep 2021 22:29:18 +0000 (08:29 +1000)]
Merge remote-tracking branch 'net/master'

3 years agoMerge branches 'clk-kirkwood', 'clk-imx', 'clk-doc', 'clk-zynq' and 'clk-ralink'...
Stephen Boyd [Wed, 1 Sep 2021 22:27:07 +0000 (15:27 -0700)]
Merge branches 'clk-kirkwood', 'clk-imx', 'clk-doc', 'clk-zynq' and 'clk-ralink' into clk-next

* clk-kirkwood:
  clk: kirkwood: Fix a clocking boot regression

* clk-imx:
  clk: imx8mn: Add M7 core clock
  clk: imx8m: fix clock tree update of TF-A managed clocks
  clk: imx: clk-divider-gate: Switch to clk_divider.determine_rate
  clk: imx8mn: use correct mux type for clkout path
  clk: imx8mm: use correct mux type for clkout path

* clk-doc:
  dt-bindings: clock: samsung: fix header path in example
  MAINTAINERS: clock: include S3C and S5P in Samsung SoC clock entry
  dt-bindings: clock: samsung: convert S5Pv210 AudSS to dtschema
  dt-bindings: clock: samsung: convert Exynos AudSS to dtschema
  dt-bindings: clock: samsung: convert Exynos4 to dtschema
  dt-bindings: clock: samsung: convert Exynos3250 to dtschema
  dt-bindings: clock: samsung: convert Exynos542x to dtschema
  dt-bindings: clock: samsung: add bindings for Exynos external clock
  dt-bindings: clock: samsung: convert Exynos5250 to dtschema
  dt-bindings: clock: brcm,iproc-clocks: fix armpll properties
  clk: zynqmp: Fix kernel-doc format
  clk: at91: sama7g5: remove all kernel-doc & kernel-doc warnings
  clk: zynqmp: fix kernel doc

* clk-zynq:
  clk: zynqmp: Fix a memory leak
  clk: zynqmp: Check the return type

* clk-ralink:
  clk: ralink: avoid to set 'CLK_IS_CRITICAL' flag for gates

3 years agoMerge branches 'clk-nvidia', 'clk-rockchip', 'clk-at91' and 'clk-vc5' into clk-next
Stephen Boyd [Wed, 1 Sep 2021 22:26:58 +0000 (15:26 -0700)]
Merge branches 'clk-nvidia', 'clk-rockchip', 'clk-at91' and 'clk-vc5' into clk-next

 - Support the SD/OE pin on IDT VersaClock 5 and 6 clock generators

* clk-nvidia:
  clk: tegra: fix old-style declaration
  clk: tegra: Remove CLK_IS_CRITICAL flag from fuse clock
  soc/tegra: fuse: Enable fuse clock on suspend for Tegra124
  soc/tegra: fuse: Add runtime PM support
  soc/tegra: fuse: Clear fuse->clk on driver probe failure
  soc/tegra: pmc: Prevent racing with cpuilde driver
  soc/tegra: bpmp: Remove unused including <linux/version.h>

* clk-rockchip:
  clk: rockchip: make rk3308 ddrphy4x clock critical
  clk: rockchip: drop GRF dependency for rk3328/rk3036 pll types
  dt-bindings: clk: Convert rockchip,rk3399-cru to DT schema
  clk: rockchip: Add support for hclk_sfc on rk3036
  clk: rockchip: rk3036: fix up the sclk_sfc parent error
  clk: rockchip: add dt-binding clkid for hclk_sfc on rk3036

* clk-at91:
  clk: at91: clk-generated: Limit the requested rate to our range

* clk-vc5:
  clk: vc5: Add properties for configuring SD/OE behavior
  clk: vc5: Use dev_err_probe
  dt-bindings: clk: vc5: Add properties for configuring the SD/OE pin

3 years agoMerge branch 'clk-frac-divider' into clk-next
Stephen Boyd [Wed, 1 Sep 2021 22:26:42 +0000 (15:26 -0700)]
Merge branch 'clk-frac-divider' into clk-next

 - Add power of two flag to fractional divider clk type

* clk-frac-divider:
  clk: fractional-divider: Document the arithmetics used behind the code
  clk: fractional-divider: Introduce POWER_OF_TWO_PS flag
  clk: fractional-divider: Hide clk_fractional_divider_ops from wide audience
  clk: fractional-divider: Export approximation algorithm to the CCF users

3 years agoMerge branches 'clk-renesas', 'clk-cleanup' and 'clk-determine-divider' into clk...
Stephen Boyd [Wed, 1 Sep 2021 22:25:15 +0000 (15:25 -0700)]
Merge branches 'clk-renesas', 'clk-cleanup' and 'clk-determine-divider' into clk-next

 - Migrate some clk drivers to clk_divider_ops.determine_rate

* clk-renesas:
  clk: renesas: Make CLK_R9A06G032 invisible
  clk: renesas: r9a07g044: Add entry for fixed clock P0_DIV2
  dt-bindings: clock: r9a07g044-cpg: Add entry for P0_DIV2 core clock
  clk: renesas: r9a07g044: Add clock and reset entries for ADC
  clk: renesas: r9a07g044: Add clock and reset entries for CANFD
  clk: renesas: Rename renesas-rzg2l-cpg.[ch] to rzg2l-cpg.[ch]
  clk: renesas: r9a07g044: Add GPIO clock and reset entries
  clk: renesas: r9a07g044: Add SSIF-2 clock and reset entries
  clk: renesas: r9a07g044: Add USB clocks/resets
  clk: renesas: r9a07g044: Add DMAC clocks/resets
  clk: renesas: r9a07g044: Add I2C clocks/resets
  clk: renesas: r8a779a0: Add the DSI clocks
  clk: renesas: r8a779a0: Add the DU clock
  clk: renesas: rzg2: Rename i2c-dvfs to iic-pmic
  clk: renesas: rzg2l: Fix off-by-one check in rzg2l_cpg_clk_src_twocell_get()
  clk: renesas: rzg2l: Avoid mixing error pointers and NULL
  clk: renesas: rzg2l: Fix a double free on error
  clk: renesas: rzg2l: Fix return value and unused assignment
  clk: renesas: rzg2l: Remove unneeded semicolon

* clk-cleanup:
  clk: palmas: Add a missing SPDX license header
  clk: Align provider-specific CLK_* bit definitions

* clk-determine-divider:
  clk: stm32mp1: Switch to clk_divider.determine_rate
  clk: stm32h7: Switch to clk_divider.determine_rate
  clk: stm32f4: Switch to clk_divider.determine_rate
  clk: bcm2835: Switch to clk_divider.determine_rate
  clk: divider: Implement and wire up .determine_rate by default

3 years agoMerge branches 'clk-qcom', 'clk-socfpga', 'clk-mediatek', 'clk-lmk' and 'clk-x86...
Stephen Boyd [Wed, 1 Sep 2021 22:24:59 +0000 (15:24 -0700)]
Merge branches 'clk-qcom', 'clk-socfpga', 'clk-mediatek', 'clk-lmk' and 'clk-x86' into clk-next

 - Support video, gpu, display clks on qcom sc7280 SoCs
 - GCC clks on qcom MSM8953, SM4250/6115, and SM6350 SoCs
 - Multimedia clks (MMCC) on qcom MSM8994/MSM8992
 - Migrate to clk_parent_data in gcc-sdm660
 - RPMh clks on qcom SM6350 SoCs
 - Support for Mediatek MT8192 SoCs

* clk-qcom: (38 commits)
  clk: qcom: Add SM6350 GCC driver
  dt-bindings: clock: Add SM6350 GCC clock bindings
  clk: qcom: rpmh: Add support for RPMH clocks on SM6350
  dt-bindings: clock: Add RPMHCC bindings for SM6350
  clk: qcom: adjust selects for SM_VIDEOCC_8150 and SM_VIDEOCC_8250
  clk: qcom: Add Global Clock controller (GCC) driver for SM6115
  dt-bindings: clk: qcom: gcc-sm6115: Document SM6115 GCC
  clk: qcom: mmcc-msm8994: Add MSM8992 support
  clk: qcom: Add msm8994 MMCC driver
  dt-bindings: clock: Add support for MSM8992/4 MMCC
  clk: qcom: Add Global Clock Controller driver for MSM8953
  dt-bindings: clock: add Qualcomm MSM8953 GCC driver bindings
  clk: qcom: gcc-sdm660: Replace usage of parent_names
  clk: qcom: gcc-sdm660: Move parent tables after PLLs
  clk: qcom: use devm_pm_runtime_enable and devm_pm_clk_create
  PM: runtime: add devm_pm_clk_create helper
  PM: runtime: add devm_pm_runtime_enable helper
  clk: qcom: a53-pll: Add MSM8939 a53pll support
  dt-bindings: clock: Update qcom,a53pll bindings for MSM8939 support
  clk: qcom: a53pll/mux: Use unique clock name
  ...

* clk-socfpga:
  clk: socfpga: agilex: add the bypass register for s2f_usr0 clock
  clk: socfpga: agilex: fix up s2f_user0_clk representation
  clk: socfpga: agilex: fix the parents of the psi_ref_clk

* clk-mediatek: (22 commits)
  clk: mediatek: make COMMON_CLK_MT8167* depend on COMMON_CLK_MT8167
  clk: mediatek: Add MT8192 vencsys clock support
  clk: mediatek: Add MT8192 vdecsys clock support
  clk: mediatek: Add MT8192 scp adsp clock support
  clk: mediatek: Add MT8192 msdc clock support
  clk: mediatek: Add MT8192 mmsys clock support
  clk: mediatek: Add MT8192 mfgcfg clock support
  clk: mediatek: Add MT8192 mdpsys clock support
  clk: mediatek: Add MT8192 ipesys clock support
  clk: mediatek: Add MT8192 imp i2c wrapper clock support
  clk: mediatek: Add MT8192 imgsys clock support
  clk: mediatek: Add MT8192 camsys clock support
  clk: mediatek: Add MT8192 audio clock support
  clk: mediatek: Add MT8192 basic clocks support
  clk: mediatek: Add mtk_clk_simple_probe() to simplify clock providers
  clk: mediatek: Add configurable enable control to mtk_pll_data
  clk: mediatek: Fix asymmetrical PLL enable and disable control
  clk: mediatek: Get regmap without syscon compatible check
  clk: mediatek: Add dt-bindings of MT8192 clocks
  dt-bindings: ARM: Mediatek: Add audsys document binding for MT8192
  ...

* clk-lmk:
  clk: lmk04832: drop redundant fallthrough statements

* clk-x86:
  clk: x86: Rename clk-lpt to more specific clk-lpss-atom

3 years agoNET_VENDOR_CIRRUS is not ready for COMPILE_TEST
Stephen Rothwell [Mon, 9 Aug 2021 10:04:59 +0000 (20:04 +1000)]
NET_VENDOR_CIRRUS is not ready for COMPILE_TEST

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
3 years agodrm/sched: fix the bug of time out calculation(v4)
Monk Liu [Wed, 1 Sep 2021 00:46:46 +0000 (08:46 +0800)]
drm/sched: fix the bug of time out calculation(v4)

issue:
in cleanup_job the cancle_delayed_work will cancel a TO timer
even the its corresponding job is still running.

fix:
do not cancel the timer in cleanup_job, instead do the cancelling
only when the heading job is signaled, and if there is a "next" job
we start_timeout again.

v2:
further cleanup the logic, and do the TDR timer cancelling if the signaled job
is the last one in its scheduler.

v3:
change the issue description
remove the cancel_delayed_work in the begining of the cleanup_job
recover the implement of drm_sched_job_begin.

v4:
remove the kthread_should_park() checking in cleanup_job routine,
we should cleanup the signaled job asap

TODO:
1)introduce pause/resume scheduler in job_timeout to serial the handling
of scheduler and job_timeout.
2)drop the bad job's del and insert in scheduler due to above serialization
(no race issue anymore with the serialization)

Tested-by: Jingwen Chen <Jingwen.Chen2@amd.com>
Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
3 years agodrm/radeon: Add HD-audio component notifier support (v2)
Takashi Iwai [Mon, 22 Jul 2019 14:38:14 +0000 (16:38 +0200)]
drm/radeon: Add HD-audio component notifier support (v2)

This patch adds the support for the notification of HD-audio hotplug
via the already existing drm_audio_component framework to radeon
driver.  This allows us more reliable hotplug notification and ELD
transfer without accessing HD-audio bus; it's more efficient, and more
importantly, it works without waking up the runtime PM.

The implementation is rather simplistic: radeon driver provides the
get_eld ops for HD-audio, and it notifies the audio hotplug via
pin_eld_notify callback upon each radeon_audio_enable() call.
The pin->id is referred as the port number passed to the notifier
callback, and the corresponding connector is looked through the
encoder list in the get_eld callback in turn.

The bind and unbind callbacks handle the device-link so that it
assures the PM call order.

v2: fix the logic in radeon_audio_component_get_eld to walk the
connector list since that is where the EDID lives and we can
derive the encoder from the connector because the encoder has
not been assigned at this point (i.e., during monitor probe).

Acked-by: Jim Qu <Jim.Qu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>