From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: Mon, 11 Nov 2024 11:16:33 +0000 (+0100)
Subject: Merge tag 'v6.12-rc7' into __tmp-hansg-linux-tags_media_atomisp_6_13_1
X-Git-Tag: v6.13-rc1~149^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5516200c466f92954551406ea641376963c43a92;p=thirdparty%2Flinux.git

Merge tag 'v6.12-rc7' into __tmp-hansg-linux-tags_media_atomisp_6_13_1

Linux 6.12-rc7

* tag 'v6.12-rc7': (1909 commits)
  Linux 6.12-rc7
  filemap: Fix bounds checking in filemap_read()
  i2c: designware: do not hold SCL low when I2C_DYNAMIC_TAR_UPDATE is not set
  mailmap: add entry for Thorsten Blum
  ocfs2: remove entry once instead of null-ptr-dereference in ocfs2_xa_remove()
  signal: restore the override_rlimit logic
  fs/proc: fix compile warning about variable 'vmcore_mmap_ops'
  ucounts: fix counter leak in inc_rlimit_get_ucounts()
  selftests: hugetlb_dio: check for initial conditions to skip in the start
  mm: fix docs for the kernel parameter ``thp_anon=``
  mm/damon/core: avoid overflow in damon_feed_loop_next_input()
  mm/damon/core: handle zero schemes apply interval
  mm/damon/core: handle zero {aggregation,ops_update} intervals
  mm/mlock: set the correct prev on failure
  objpool: fix to make percpu slot allocation more robust
  mm/page_alloc: keep track of free highatomic
  bcachefs: Fix UAF in __promote_alloc() error path
  bcachefs: Change OPT_STR max to be 1 less than the size of choices array
  bcachefs: btree_cache.freeable list fixes
  bcachefs: check the invalid parameter for perf test
  ...
---

5516200c466f92954551406ea641376963c43a92
diff --cc drivers/media/i2c/ov08x40.c
index ff17e09a1f961,7ead3c720e0e1..b9682264e2f53
--- a/drivers/media/i2c/ov08x40.c
+++ b/drivers/media/i2c/ov08x40.c
@@@ -1,11 -1,9 +1,11 @@@
  // SPDX-License-Identifier: GPL-2.0
  // Copyright (c) 2022 Intel Corporation.
  
- #include <asm-generic/unaligned.h>
+ #include <linux/unaligned.h>
  #include <linux/acpi.h>
 +#include <linux/clk.h>
  #include <linux/i2c.h>
 +#include <linux/gpio/consumer.h>
  #include <linux/module.h>
  #include <linux/delay.h>
  #include <linux/pm_runtime.h>