Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git

# Conflicts:
#	drivers/firmware/qcom/Kconfig
#	drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
#	drivers/gpu/drm/drm_panic.c
#	drivers/gpu/drm/vc4/vc4_v3d.c
#	drivers/soc/qcom/qcom-geni-se.c
#	rust/kernel/mem.rs

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/cgroup/dmem.c b/kernel/cgroup/dmem.c
index 4683f3d68022..47a41646de4b 100644
--- a/kernel/cgroup/dmem.c
+++ b/kernel/cgroup/dmem.c
@@ -28,7 +28,7 @@ DEFINE_STATIC_SRCU(dmemcg_srcu);
 struct dmem_cgroup_region {
 	/**
 	 * @ref: References keeping the region alive.
-	 * Keeps the region reference alive after a succesful RCU lookup.
+	 * Keeps the region reference alive after a successful RCU lookup.
 	 */
 	struct kref ref;
 
@@ -696,7 +696,7 @@ EXPORT_SYMBOL_GPL(dmem_cgroup_uncharge);
  * dmem_cgroup_try_charge() - Try charging a new allocation to a region.
  * @region: dmem region to charge
  * @size: Size (in bytes) to charge.
- * @ret_pool: On succesfull allocation, the pool that is charged.
+ * @ret_pool: On successful allocation, the pool that is charged.
  * @ret_limit_pool: On a failed allocation, the limiting pool.
  *
  * This function charges the @region region for a size of @size bytes.