]> www.infradead.org Git - users/hch/block.git/log
users/hch/block.git
4 years agoMerge remote-tracking branch 'bluetooth/master' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:48:21 +0000 (10:48 +1100)]
Merge remote-tracking branch 'bluetooth/master' into master

4 years agoMerge remote-tracking branch 'net-next/master' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:46:42 +0000 (10:46 +1100)]
Merge remote-tracking branch 'net-next/master' into master

4 years agoMerge remote-tracking branch 'rdma/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:44:25 +0000 (10:44 +1100)]
Merge remote-tracking branch 'rdma/for-next' into master

4 years agoMerge remote-tracking branch 'ieee1394/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:42:53 +0000 (10:42 +1100)]
Merge remote-tracking branch 'ieee1394/for-next' into master

4 years agoMerge remote-tracking branch 'thermal/thermal/linux-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:41:13 +0000 (10:41 +1100)]
Merge remote-tracking branch 'thermal/thermal/linux-next' into master

4 years agoMerge remote-tracking branch 'opp/opp/linux-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:39:19 +0000 (10:39 +1100)]
Merge remote-tracking branch 'opp/opp/linux-next' into master

4 years agoMerge remote-tracking branch 'devfreq/devfreq-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:37:21 +0000 (10:37 +1100)]
Merge remote-tracking branch 'devfreq/devfreq-next' into master

4 years agoMerge remote-tracking branch 'cpupower/cpupower' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:36:26 +0000 (10:36 +1100)]
Merge remote-tracking branch 'cpupower/cpupower' into master

4 years agoMerge remote-tracking branch 'cpufreq-arm/cpufreq/arm/linux-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:34:47 +0000 (10:34 +1100)]
Merge remote-tracking branch 'cpufreq-arm/cpufreq/arm/linux-next' into master

4 years agoMerge remote-tracking branch 'pm/linux-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:32:42 +0000 (10:32 +1100)]
Merge remote-tracking branch 'pm/linux-next' into master

4 years agoMerge remote-tracking branch 'v4l-dvb-next/master' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:32:41 +0000 (10:32 +1100)]
Merge remote-tracking branch 'v4l-dvb-next/master' into master

4 years agoMerge remote-tracking branch 'v4l-dvb/master' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:19:26 +0000 (10:19 +1100)]
Merge remote-tracking branch 'v4l-dvb/master' into master

4 years agoMerge remote-tracking branch 'jc_docs/docs-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:06:07 +0000 (10:06 +1100)]
Merge remote-tracking branch 'jc_docs/docs-next' into master

4 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:04:55 +0000 (10:04 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next' into master

4 years agoMerge remote-tracking branch 'dmi/dmi-for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:03:17 +0000 (10:03 +1100)]
Merge remote-tracking branch 'dmi/dmi-for-next' into master

4 years agoMerge remote-tracking branch 'hid/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:01:42 +0000 (10:01 +1100)]
Merge remote-tracking branch 'hid/for-next' into master

4 years agoMerge remote-tracking branch 'pstore/for-next/pstore' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:01:42 +0000 (10:01 +1100)]
Merge remote-tracking branch 'pstore/for-next/pstore' into master

# Conflicts:
# .mailmap

4 years agoMerge remote-tracking branch 'printk/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 23:01:40 +0000 (10:01 +1100)]
Merge remote-tracking branch 'printk/for-next' into master

4 years agoMerge remote-tracking branch 'vfs/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:49:11 +0000 (09:49 +1100)]
Merge remote-tracking branch 'vfs/for-next' into master

4 years agoMerge remote-tracking branch 'file-locks/locks-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:47:33 +0000 (09:47 +1100)]
Merge remote-tracking branch 'file-locks/locks-next' into master

4 years agoMerge remote-tracking branch 'xfs/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:46:16 +0000 (09:46 +1100)]
Merge remote-tracking branch 'xfs/for-next' into master

4 years agoMerge remote-tracking branch 'f2fs/dev' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:45:03 +0000 (09:45 +1100)]
Merge remote-tracking branch 'f2fs/dev' into master

4 years agoMerge remote-tracking branch 'ext4/dev' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:45:02 +0000 (09:45 +1100)]
Merge remote-tracking branch 'ext4/dev' into master

4 years agoMerge remote-tracking branch 'ext3/for_next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:45:02 +0000 (09:45 +1100)]
Merge remote-tracking branch 'ext3/for_next' into master

4 years agoMerge remote-tracking branch 'btrfs/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:45:01 +0000 (09:45 +1100)]
Merge remote-tracking branch 'btrfs/for-next' into master

4 years agoMerge remote-tracking branch 'xtensa/xtensa-for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:44:04 +0000 (09:44 +1100)]
Merge remote-tracking branch 'xtensa/xtensa-for-next' into master

4 years agoMerge remote-tracking branch 's390/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:44:03 +0000 (09:44 +1100)]
Merge remote-tracking branch 's390/for-next' into master

4 years agoMerge remote-tracking branch 'risc-v/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:43:08 +0000 (09:43 +1100)]
Merge remote-tracking branch 'risc-v/for-next' into master

# Conflicts:
# arch/riscv/kernel/vdso/Makefile

4 years agoMerge remote-tracking branch 'parisc-hd/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:42:10 +0000 (09:42 +1100)]
Merge remote-tracking branch 'parisc-hd/for-next' into master

4 years agoMerge remote-tracking branch 'nds32/next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:41:13 +0000 (09:41 +1100)]
Merge remote-tracking branch 'nds32/next' into master

4 years agoMerge remote-tracking branch 'mips/mips-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:39:45 +0000 (09:39 +1100)]
Merge remote-tracking branch 'mips/mips-next' into master

4 years agoMerge remote-tracking branch 'm68knommu/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:38:49 +0000 (09:38 +1100)]
Merge remote-tracking branch 'm68knommu/for-next' into master

4 years agoMerge remote-tracking branch 'h8300/h8300-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:37:06 +0000 (09:37 +1100)]
Merge remote-tracking branch 'h8300/h8300-next' into master

4 years agoMerge remote-tracking branch 'csky/linux-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:36:09 +0000 (09:36 +1100)]
Merge remote-tracking branch 'csky/linux-next' into master

4 years agoMerge remote-tracking branch 'ti-k3-new/ti-k3-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:35:13 +0000 (09:35 +1100)]
Merge remote-tracking branch 'ti-k3-new/ti-k3-next' into master

4 years agoMerge remote-tracking branch 'ti-k3/ti-k3-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:35:12 +0000 (09:35 +1100)]
Merge remote-tracking branch 'ti-k3/ti-k3-next' into master

4 years agoMerge remote-tracking branch 'tegra/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:35:07 +0000 (09:35 +1100)]
Merge remote-tracking branch 'tegra/for-next' into master

4 years agoMerge remote-tracking branch 'sunxi/sunxi/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:34:11 +0000 (09:34 +1100)]
Merge remote-tracking branch 'sunxi/sunxi/for-next' into master

4 years agoMerge remote-tracking branch 'samsung-krzk/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:33:12 +0000 (09:33 +1100)]
Merge remote-tracking branch 'samsung-krzk/for-next' into master

4 years agoMerge remote-tracking branch 'rockchip/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:33:11 +0000 (09:33 +1100)]
Merge remote-tracking branch 'rockchip/for-next' into master

4 years agoMerge remote-tracking branch 'reset/reset/next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:31:14 +0000 (09:31 +1100)]
Merge remote-tracking branch 'reset/reset/next' into master

4 years agoMerge remote-tracking branch 'renesas/next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:31:13 +0000 (09:31 +1100)]
Merge remote-tracking branch 'renesas/next' into master

4 years agoMerge remote-tracking branch 'realtek/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:31:13 +0000 (09:31 +1100)]
Merge remote-tracking branch 'realtek/for-next' into master

4 years agoMerge remote-tracking branch 'qcom/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:29:16 +0000 (09:29 +1100)]
Merge remote-tracking branch 'qcom/for-next' into master

4 years agoMerge remote-tracking branch 'omap/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:29:12 +0000 (09:29 +1100)]
Merge remote-tracking branch 'omap/for-next' into master

4 years agoMerge remote-tracking branch 'mvebu/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:28:15 +0000 (09:28 +1100)]
Merge remote-tracking branch 'mvebu/for-next' into master

4 years agoMerge remote-tracking branch 'mediatek/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:26:35 +0000 (09:26 +1100)]
Merge remote-tracking branch 'mediatek/for-next' into master

4 years agoMerge remote-tracking branch 'keystone/next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:26:35 +0000 (09:26 +1100)]
Merge remote-tracking branch 'keystone/next' into master

4 years agoMerge remote-tracking branch 'imx-mxs/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:25:08 +0000 (09:25 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next' into master

4 years agoMerge remote-tracking branch 'drivers-memory/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:23:30 +0000 (09:23 +1100)]
Merge remote-tracking branch 'drivers-memory/for-next' into master

4 years agoMerge remote-tracking branch 'at91/at91-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:22:34 +0000 (09:22 +1100)]
Merge remote-tracking branch 'at91/at91-next' into master

4 years agoMerge remote-tracking branch 'aspeed/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:21:38 +0000 (09:21 +1100)]
Merge remote-tracking branch 'aspeed/for-next' into master

4 years agoMerge remote-tracking branch 'amlogic/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:19:38 +0000 (09:19 +1100)]
Merge remote-tracking branch 'amlogic/for-next' into master

4 years agoMerge remote-tracking branch 'arm-soc/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:18:42 +0000 (09:18 +1100)]
Merge remote-tracking branch 'arm-soc/for-next' into master

4 years agoMerge remote-tracking branch 'arm/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:15:47 +0000 (09:15 +1100)]
Merge remote-tracking branch 'arm/for-next' into master

4 years agoMerge remote-tracking branch 'asm-generic/master' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:02:24 +0000 (09:02 +1100)]
Merge remote-tracking branch 'asm-generic/master' into master

4 years agoMerge remote-tracking branch 'dma-mapping/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 22:00:47 +0000 (09:00 +1100)]
Merge remote-tracking branch 'dma-mapping/for-next' into master

4 years agoMerge remote-tracking branch 'kbuild/for-next' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:59:51 +0000 (08:59 +1100)]
Merge remote-tracking branch 'kbuild/for-next' into master

4 years agoMerge remote-tracking branch 'kspp-gustavo/for-next/kspp' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:48:22 +0000 (08:48 +1100)]
Merge remote-tracking branch 'kspp-gustavo/for-next/kspp' into master

4 years agoMerge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:36:01 +0000 (08:36 +1100)]
Merge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes' into master

4 years agoMerge remote-tracking branch 'kunit-fixes/kunit-fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:36:00 +0000 (08:36 +1100)]
Merge remote-tracking branch 'kunit-fixes/kunit-fixes' into master

4 years agoMerge remote-tracking branch 'pidfd-fixes/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:58 +0000 (08:35 +1100)]
Merge remote-tracking branch 'pidfd-fixes/fixes' into master

4 years agoMerge remote-tracking branch 'hyperv-fixes/hyperv-fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:56 +0000 (08:35 +1100)]
Merge remote-tracking branch 'hyperv-fixes/hyperv-fixes' into master

4 years agoMerge remote-tracking branch 'mmc-fixes/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:54 +0000 (08:35 +1100)]
Merge remote-tracking branch 'mmc-fixes/fixes' into master

4 years agoMerge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:54 +0000 (08:35 +1100)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes' into master

4 years agoMerge remote-tracking branch 'scsi-fixes/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:53 +0000 (08:35 +1100)]
Merge remote-tracking branch 'scsi-fixes/fixes' into master

4 years agoMerge remote-tracking branch 'samsung-krzk-fixes/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:53 +0000 (08:35 +1100)]
Merge remote-tracking branch 'samsung-krzk-fixes/fixes' into master

# Conflicts:
# MAINTAINERS

4 years agoMerge remote-tracking branch 'vfs-fixes/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:52 +0000 (08:35 +1100)]
Merge remote-tracking branch 'vfs-fixes/fixes' into master

4 years agoMerge remote-tracking branch 'btrfs-fixes/next-fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:50 +0000 (08:35 +1100)]
Merge remote-tracking branch 'btrfs-fixes/next-fixes' into master

4 years agoMerge remote-tracking branch 'hwmon-fixes/hwmon' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:49 +0000 (08:35 +1100)]
Merge remote-tracking branch 'hwmon-fixes/hwmon' into master

4 years agoMerge remote-tracking branch 'kvm-fixes/master' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:49 +0000 (08:35 +1100)]
Merge remote-tracking branch 'kvm-fixes/master' into master

4 years agoMerge remote-tracking branch 'mips-fixes/mips-fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:48 +0000 (08:35 +1100)]
Merge remote-tracking branch 'mips-fixes/mips-fixes' into master

4 years agoMerge remote-tracking branch 'mtd-fixes/mtd/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:48 +0000 (08:35 +1100)]
Merge remote-tracking branch 'mtd-fixes/mtd/fixes' into master

4 years agoMerge remote-tracking branch 'dmaengine-fixes/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:47 +0000 (08:35 +1100)]
Merge remote-tracking branch 'dmaengine-fixes/fixes' into master

4 years agoMerge remote-tracking branch 'kselftest-fixes/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:46 +0000 (08:35 +1100)]
Merge remote-tracking branch 'kselftest-fixes/fixes' into master

4 years agoMerge remote-tracking branch 'ide/master' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:43 +0000 (08:35 +1100)]
Merge remote-tracking branch 'ide/master' into master

4 years agoMerge remote-tracking branch 'input-current/for-linus' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:36 +0000 (08:35 +1100)]
Merge remote-tracking branch 'input-current/for-linus' into master

4 years agoMerge remote-tracking branch 'thunderbolt-fixes/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:35 +0000 (08:35 +1100)]
Merge remote-tracking branch 'thunderbolt-fixes/fixes' into master

4 years agoMerge remote-tracking branch 'char-misc.current/char-misc-linus' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:35 +0000 (08:35 +1100)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus' into master

4 years agoMerge remote-tracking branch 'staging.current/staging-linus' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:34 +0000 (08:35 +1100)]
Merge remote-tracking branch 'staging.current/staging-linus' into master

4 years agoMerge remote-tracking branch 'phy/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:34 +0000 (08:35 +1100)]
Merge remote-tracking branch 'phy/fixes' into master

4 years agoMerge remote-tracking branch 'usb-chipidea-fixes/for-usb-fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:33 +0000 (08:35 +1100)]
Merge remote-tracking branch 'usb-chipidea-fixes/for-usb-fixes' into master

4 years agoMerge remote-tracking branch 'usb-serial-fixes/usb-linus' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:33 +0000 (08:35 +1100)]
Merge remote-tracking branch 'usb-serial-fixes/usb-linus' into master

4 years agoMerge remote-tracking branch 'usb-gadget-fixes/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:33 +0000 (08:35 +1100)]
Merge remote-tracking branch 'usb-gadget-fixes/fixes' into master

# Conflicts:
# drivers/usb/cdns3/gadget.c
# drivers/usb/dwc3/dwc3-of-simple.c
# drivers/usb/dwc3/gadget.c

4 years agoMerge remote-tracking branch 'usb.current/usb-linus' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:30 +0000 (08:35 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus' into master

4 years agoMerge remote-tracking branch 'tty.current/tty-linus' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:30 +0000 (08:35 +1100)]
Merge remote-tracking branch 'tty.current/tty-linus' into master

4 years agoMerge remote-tracking branch 'spi-fixes/for-linus' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:29 +0000 (08:35 +1100)]
Merge remote-tracking branch 'spi-fixes/for-linus' into master

4 years agoMerge remote-tracking branch 'regulator-fixes/for-linus' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:26 +0000 (08:35 +1100)]
Merge remote-tracking branch 'regulator-fixes/for-linus' into master

4 years agoMerge remote-tracking branch 'regmap-fixes/for-linus' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:26 +0000 (08:35 +1100)]
Merge remote-tracking branch 'regmap-fixes/for-linus' into master

4 years agoMerge remote-tracking branch 'sound-asoc-fixes/for-linus' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:25 +0000 (08:35 +1100)]
Merge remote-tracking branch 'sound-asoc-fixes/for-linus' into master

4 years agoMerge remote-tracking branch 'sound-current/for-linus' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:25 +0000 (08:35 +1100)]
Merge remote-tracking branch 'sound-current/for-linus' into master

4 years agoMerge remote-tracking branch 'ipsec/master' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:23 +0000 (08:35 +1100)]
Merge remote-tracking branch 'ipsec/master' into master

4 years agoMerge remote-tracking branch 'bpf/master' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:22 +0000 (08:35 +1100)]
Merge remote-tracking branch 'bpf/master' into master

4 years agoMerge remote-tracking branch 'sparc/master' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:19 +0000 (08:35 +1100)]
Merge remote-tracking branch 'sparc/master' into master

4 years agoMerge remote-tracking branch 'arm-soc-fixes/arm/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:19 +0000 (08:35 +1100)]
Merge remote-tracking branch 'arm-soc-fixes/arm/fixes' into master

4 years agoMerge remote-tracking branch 'arm64-fixes/for-next/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:18 +0000 (08:35 +1100)]
Merge remote-tracking branch 'arm64-fixes/for-next/fixes' into master

4 years agoMerge remote-tracking branch 'arm-current/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:18 +0000 (08:35 +1100)]
Merge remote-tracking branch 'arm-current/fixes' into master

4 years agoMerge remote-tracking branch 'kbuild-current/fixes' into master
Stephen Rothwell [Thu, 29 Oct 2020 21:35:17 +0000 (08:35 +1100)]
Merge remote-tracking branch 'kbuild-current/fixes' into master

4 years agoARM: SoC: document merges
Arnd Bergmann [Thu, 29 Oct 2020 21:26:04 +0000 (22:26 +0100)]
ARM: SoC: document merges

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
4 years agoMerge branch 'arm/fixes' into for-next
Arnd Bergmann [Thu, 29 Oct 2020 21:23:39 +0000 (22:23 +0100)]
Merge branch 'arm/fixes' into for-next

* arm/fixes:
  soc: ti: ti_sci_pm_domains: check for proper args count in xlate
  arm64: dts: allwinner: h5: OrangePi Prime: Fix ethernet node
  arm64: dts: allwinner: a64: bananapi-m64: Enable RGMII RX/TX delay on PHY
  arm64: dts: allwinner: h5: libretech-all-h5-cc: Enable RGMII RX/TX delay on PHY
  ARM: dts: sunxi: bananapi-m2-plus: Enable RGMII RX/TX delay on Ethernet PHY
  ARM: dts: sun9i: Enable both RGMII RX/TX delay on Ethernet PHY
  ARM: dts: sun8i: a83t: Enable both RGMII RX/TX delay on Ethernet PHY
  ARM: dts: sun8i: h3: orangepi-plus2e: Enable RGMII RX/TX delay on Ethernet PHY
  ARM: dts: sun7i: bananapi-m1-plus: Enable RGMII RX/TX delay on Ethernet PHY
  ARM: dts: sun7i: cubietruck: Enable RGMII RX/TX delay on Ethernet PHY
  ARM: dts: sun6i: a31-hummingbird: Enable RGMII RX/TX delay on Ethernet PHY
  Revert "arm: sun8i: orangepi-pc-plus: Set EMAC activity LEDs to active high"
  ARM: dts: sun8i: r40: bananapi-m2-ultra: Fix ethernet node
  arm64: dts: allwinner: h5: OrangePi PC2: Fix ethernet node
  arm64: dts: allwinner: a64: Pine64 Plus: Fix ethernet node
  arm64: dts: allwinner: a64: OrangePi Win: Fix ethernet node
  arm64: dts: allwinner: Pine H64: Enable both RGMII RX/TX delay
  arm64: dts: allwinner: beelink-gs1: Enable both RGMII RX/TX delay
  arm64: dts: allwinner: pinetab: Drop unnecessary address/size-cells information
  MAINTAINERS: Add Jernej Škrabec as a reviewer for Allwinner SoCs support