From: Christoph Hellwig Date: Fri, 25 Sep 2020 04:19:19 +0000 (+0200) Subject: Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds... X-Git-Tag: howlett/maple_spf/20210104~805^2~31 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8c1c6c7588b2faf9dd45fb3cfb7497fd09bbfe7c;p=users%2Fjedix%2Flinux-maple.git Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into dma-mapping-for-next Pull in the latest 5.9 tree for the commit to revert the V4L2_FLAG_MEMORY_NON_CONSISTENT uapi addition. --- 8c1c6c7588b2faf9dd45fb3cfb7497fd09bbfe7c