diff -Nur a/kernel/nvidia/nv-acpi.c b/kernel/nvidia/nv-acpi.c --- a/kernel/nvidia/nv-acpi.c 2022-06-30 20:05:22.000000000 +0100 +++ b/kernel/nvidia/nv-acpi.c 2022-10-13 23:34:09.841766070 +0100 @@ -16,7 +16,10 @@ #include -#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) +#include +// Rel.commit "ACPI: bus: Drop unused list heads from struct acpi_device" (Rafael J. Wysocki, 4 Jun 2022) +// Disable ACPI support due to more GPL stuff (acpi_dev_for_each_child is only GPL-exported) +#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)) static NV_STATUS nv_acpi_extract_integer (const union acpi_object *, void *, NvU32, NvU32 *); static NV_STATUS nv_acpi_extract_buffer (const union acpi_object *, void *, NvU32, NvU32 *); static NV_STATUS nv_acpi_extract_package (const union acpi_object *, void *, NvU32, NvU32 *); diff -Nur a/kernel/nvidia/nv.c b/kernel/nvidia/nv.c --- a/kernel/nvidia/nv.c 2022-06-30 20:05:22.000000000 +0100 +++ b/kernel/nvidia/nv.c 2022-10-13 23:34:09.841766070 +0100 @@ -5423,7 +5423,8 @@ { NvU8 buf[8]; -#if defined(NV_SEQ_READ_ITER_PRESENT) +// FIXME: Avoid this code path because on Linux 6.0-rc1, init_sync_kiocb references a GPL symbol +#if defined(NV_SEQ_READ_ITER_PRESENT) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)) struct file *file; ssize_t num_read; struct kiocb kiocb; diff -Nur a/kernel/nvidia-drm/nvidia-drm-helper.c b/kernel/nvidia-drm/nvidia-drm-helper.c --- a/kernel/nvidia-drm/nvidia-drm-helper.c 2022-06-30 19:33:22.000000000 +0100 +++ b/kernel/nvidia-drm/nvidia-drm-helper.c 2022-10-13 23:34:09.841766070 +0100 @@ -41,6 +41,11 @@ #include #endif +// Add header which is no longer indirectly referenced as of Linux 6.0-rc1 +#if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT) +#include +#endif + static void __nv_drm_framebuffer_put(struct drm_framebuffer *fb) { #if defined(NV_DRM_FRAMEBUFFER_GET_PRESENT)