The upstream commit 817819b27e ("media: Replace dependency on
VIDEO_V4L2_SUBDEV_API with select") made VIDEO_V4L2_SUBDEV_API hidden to
clean up the code. Since GKI wants to include this config without
including the specific vendor drivers that select this config, add it to
the GKI_HIDDEN_MEDIA_CONFIGS.
Fixes: 817819b27e ("media: Replace dependency on VIDEO_V4L2_SUBDEV_API with select")
Signed-off-by: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3db3b4cb2de0a1e3a282c5bdb5b584892a8b1fcc
Steps on the way to 6.0-rc1
Resolves conflicts in:
drivers/md/Makefile
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia92bbc0301be0797b06a04a359ffdb6406364461
Changes in 6.0-rc1 broke the out-of-tree dm-table.c changes, so fix
things up to be able to build properly again.
Bug: 147209885
Bug: 160883266
Bug: 160883801
Fixes: fd35c92fc4 ("ANDROID: dm: add support for passing through derive_sw_secret")
Cc: Barani Muthukumaran <bmuthuku@codeaurora.org>
Cc: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1c66f45414083b3cc9fdb4d17dc9f87f2fd34eb0
Add vendor hook for hung task detect, so we can decide which
threads need to check, avoiding false alarms.
Bug: 188684133
Change-Id: I5d7dfeb071cbfda8121134c38a458202aaa3a8c6
Signed-off-by: Huang Yiwei <hyiwei@codeaurora.org>
This reverts commit 25de28e49e as it
conflicts with upstream kunit changes in 6.0-rc1.
If it is still needed, please submit it usptream as it is adding a new
user/kernel api for some unknown reason.
Bug: 231160619
Cc: Joe Fradley <joefradley@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I12650bf4ca232cf416969c1b032003df80125ffc
This reverts commit 39f5348cf7 as it
conflicts with upstream kunit changes in 6.0-rc1.
If this is still needed, please submit upstream.
Bug: 231160619
Cc: Joe Fradley <joefradley@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I17cc72883f87ab7647cc9e21e7770f79f5400a65
This export was removed by the upstream commit 6390383b67
("thermal/core: Remove unneeded EXPORT_SYMBOLS") since it's only used by
the thermal frameworks. Pixel 6 is using this symbol for it's external
thermal driver module and is needed for GKI testing.
Bug: 242078480
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I5f704055f53816c1e3fdfd776c2d253dffbdab72
The sched_blocked_reason tracepoint introduced in android common
in commit 1f52bb8bfd ("ANDROID: trace: sched: add sched
blocked tracepoint which dumps out context of sleep.") calls
get_wchan().
Unfortunately, get_wchan() was reworked upstream in commit
42a20f86dc ("sched: Add wrapper for get_wchan() to keep task
blocked"), such that it now takes the task pi_lock.
This causes a deadlock, as we are already holding the pi_lock
in try_to_wakeup() when we call trace_sched_blocked_reason().
This patch reworks the tracepoint so that it calls __get_wchan()
which does not take the lock, avoiding the deadlock.
Test: Manual: run perfetto with ftrace_events: "sched/sched_blocked_reason" in the config
Fixes: 1f52bb8bfd ("ANDROID: trace: sched: add sched blocked tracepoint which dumps out context of sleep.")
Signed-off-by: John Stultz <jstultz@google.com>
Change-Id: I94e4251418d709a7b9292b3301c6cadd8fa3fb23
- Remove pci_get_legacy_ide_irq(); use ATA_PRIMARY_IRQ() and
ATA_SECONDARY_IRQ() instead (Stafford Horne)
- Remove isa_dma_bridge_buggy, except for x86_32, the only place it's used
(Stafford Horne)
- Define ARCH_GENERIC_PCI_MMAP_RESOURCE for csky (Stafford Horne)
- Move common PCI definitions that arches sometimes override to
asm-generic/pci.h (Stafford Horne)
- Include <linux/isa-dma.h> for 'isa_dma_bridge_buggy' when needed
(bisection hole here) (Randy Dunlap)
* pci/header-cleanup-immutable:
PCI: Stub __pci_ioport_map() for arches that don't support it at all
x86/cyrix: include header linux/isa-dma.h
asm-generic: Add new pci.h and use it
csky: PCI: Define ARCH_GENERIC_PCI_MMAP_RESOURCE
PCI: Move isa_dma_bridge_buggy out of asm/dma.h
PCI: Remove pci_get_legacy_ide_irq() and asm-generic/pci.h
- Drop of_match_ptr() to avoid unused variables when CONFIG_OF is unset
(Bjorn Helgaas)
- Fix ARM pci_remap_iospace() when CONFIG_MMU unset to avoid build errors
(Pali Rohár)
* pci/misc:
PCI/ACPI: Update link to PCI firmware specification
PCI: Drop of_match_ptr() to avoid unused variables
- Convert to new *_PM_OPS macros to avoid need for "#ifdef CONFIG_PM_SLEEP"
or "__maybe_unused" (Bjorn Helgaas)
* pci/ctrl/pm-ops:
PCI: Convert to new *_PM_OPS macros
- Add DT binding and driver support for Versal CPM5 Gen5 Root Port (Bharat
Kumar Gogada)
* pci/ctrl/xilinx-cpm:
MAINTAINERS: Add Xilinx Versal CPM Root Port maintainers
PCI: xilinx-cpm: Add support for Versal CPM5 Root Port
dt-bindings: PCI: xilinx-cpm: Add Versal CPM5 Root Port
- Use devm_kasprintf() instead of simple kasprintf() (Subramanian Mohan)
- Add [8086:7D0B] and [8086:AD0B] devices to VMD driver (Francisco Munoz)
* pci/ctrl/vmd:
PCI: vmd: Add DID 8086:7D0B and 8086:AD0B for Intel MTL SKUs
PCI: vmd: Use devm_kasprintf() instead of simple kasprintf()
