Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds...
authorChristoph Hellwig <hch@lst.de>
Fri, 25 Sep 2020 04:19:19 +0000 (06:19 +0200)
committerChristoph Hellwig <hch@lst.de>
Fri, 25 Sep 2020 04:19:19 +0000 (06:19 +0200)
Pull in the latest 5.9 tree for the commit to revert the
V4L2_FLAG_MEMORY_NON_CONSISTENT uapi addition.

1  2 
drivers/base/core.c
drivers/gpu/drm/sun4i/sun4i_backend.c
drivers/iommu/intel/iommu.c
drivers/usb/core/message.c
include/linux/device.h
mm/hugetlb.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/hugetlb.c
Simple merge