]> Git Repo - J-linux.git/commitdiff
Merge tag 'v6.12-rc7' into __tmp-hansg-linux-tags_media_atomisp_6_13_1
authorMauro Carvalho Chehab <[email protected]>
Mon, 11 Nov 2024 11:16:33 +0000 (12:16 +0100)
committerMauro Carvalho Chehab <[email protected]>
Mon, 11 Nov 2024 11:16:33 +0000 (12:16 +0100)
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
  ...

21 files changed:
1  2 
.mailmap
MAINTAINERS
drivers/media/common/videobuf2/videobuf2-core.c
drivers/media/i2c/adv7604.c
drivers/media/i2c/hi556.c
drivers/media/i2c/imx290.c
drivers/media/i2c/ov01a10.c
drivers/media/i2c/ov08x40.c
drivers/media/i2c/ov2740.c
drivers/media/i2c/ov5670.c
drivers/media/i2c/ov5675.c
drivers/media/i2c/ov8856.c
drivers/media/i2c/ov8858.c
drivers/media/i2c/ov9734.c
drivers/media/i2c/thp7312.c
drivers/media/i2c/vgxy61.c
drivers/media/platform/renesas/rcar_jpu.c
drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
drivers/media/test-drivers/vivid/vivid-core.c
drivers/media/test-drivers/vivid/vivid-vid-cap.c
drivers/media/usb/uvc/uvc_driver.c

diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index ff17e09a1f96175d598c395bcae0cdf01d68a79f,7ead3c720e0e11af8f9ab28000ce5dbbe6dfb773..b9682264e2f53d521be4029043229239f26954a1
@@@ -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>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
This page took 0.157226 seconds and 4 git commands to generate.