Merge remote-tracking branch 'ide/master'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 2 Jun 2021 23:12:06 +0000 (09:12 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 2 Jun 2021 23:12:06 +0000 (09:12 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Jun 2021 23:12:06 +0000 (09:12 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Jun 2021 23:12:06 +0000 (09:12 +1000)
diff --cc drivers/ide/Kconfig
Simple merge
diff --cc drivers/ide/hpt366.c
Simple merge
diff --cc drivers/ide/ide-acpi.c
Simple merge
diff --cc drivers/ide/sis5513.c
Simple merge
diff --cc include/linux/ide.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 2 Jun 2021 23:12:06 +0000 (09:12 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 2 Jun 2021 23:12:06 +0000 (09:12 +1000)
		1	2
drivers/ide/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ide/hpt366.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ide/ide-acpi.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ide/sis5513.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/ide.h	patch \|	diff1 \|	diff2 \|	blob \| history