Tejun Heo 026e14a276 Merge branch 'for-6.0-fixes' into for-6.1 ... for-6.0 has the following fix for cgroup_get_from_id(). 836ac87d ("cgroup: fix cgroup_get_from_id") which conflicts with the following two commits in for-6.1. 4534dee9 ("cgroup: cgroup: Honor caller's cgroup NS when resolving cgroup id") fa7e439c ("cgroup: Homogenize cgroup_get_from_id() return value") While the resolution is straightforward, the code ends up pretty ugly afterwards. Let's pull for-6.0-fixes into for-6.1 so that the code can be fixed up there. Signed-off-by: Tejun Heo <tj@kernel.org>		2022-09-23 07:19:38 -10:00
..
crypto/chacha20-s390	tools/testing/crypto: Use vzalloc instead of vmalloc+memset	2022-07-05 14:46:36 +02:00
cxl	cxl/hdm: Commit decoder state to hardware	2022-07-25 12:18:07 -07:00
fault-injection
ktest	bootconfig/tracing/ktest: Update ktest example for boot-time tracing	2021-08-16 11:39:51 -04:00
kunit	kunit: tool: Enable virtio/PCI by default on UML	2022-07-08 11:22:29 -06:00
memblock	memblock updates for v5.20	2022-08-09 09:48:30 -07:00
nvdimm	dax: introduce DAX_RECOVERY_WRITE dax access mode	2022-05-16 13:35:56 -07:00
radix-tree	tools: Add kmem_cache_alloc_lru()	2022-04-22 14:24:28 -04:00
scatterlist	tools/testing/scatterlist: add missing defines	2022-01-30 09:56:58 +02:00
selftests	Merge branch 'for-6.0-fixes' into for-6.1	2022-09-23 07:19:38 -10:00
vsock	af_vsock: SOCK_SEQPACKET broken buffer test	2022-03-18 15:13:19 +00:00