# Conflicts:
#	drivers/nvmem/Kconfig

# Conflicts:
#	include/asm-generic/vmlinux.lds.h

# Conflicts:
#	arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
#	drivers/gpio/gpio-ep93xx.c

# Conflicts:
#	drivers/scsi/gdth.c

# Conflicts:
#	drivers/tty/n_tracerouter.c
#	drivers/tty/n_tracesink.c
#	include/linux/mod_devicetable.h
#	scripts/mod/devicetable-offsets.c
#	scripts/mod/file2alias.c

# Conflicts:
#	include/linux/tty.h

# Conflicts:
#	Documentation/devicetree/bindings/usb/qcom,dwc3.yaml

# Conflicts:
#	drivers/gpu/drm/gma500/Kconfig
#	drivers/gpu/drm/gma500/mdfld_device.c
#	drivers/gpu/drm/gma500/mdfld_dsi_output.c
#	drivers/gpu/drm/gma500/mdfld_output.c
#	drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c
#	drivers/platform/x86/ideapad-laptop.c

# Conflicts:
#	arch/x86/kvm/x86.c

# Conflicts:
#	include/linux/rcupdate.h
#	kernel/rcu/tree.c
#	kernel/rcu/tree_plugin.h

"GPL v2" is the same as "GPL". It exists for historic reasons.
See Documentation/process/license-rules.rst

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20210122070634.12825-8-yung-chuan.liao@linux.intel.com


Signed-off-by: Vinod Koul <vkoul@kernel.org>