diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-19 17:14:35 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-19 17:14:35 +0100 |
| commit | 59e52db8a2349e1f1b64e50790dc3bb6afe08ec7 (patch) | |
| tree | d3d07fcdb7312e745fae989f2dae8c1e5f02cc75 /patch-5.16-redhat.patch | |
| parent | 4027d343776faef10a1d9208bc9a7389f2d12c7e (diff) | |
| parent | a514e7dbf8c4be4a96f20de928793eb471faa0ff (diff) | |
| download | kernel-59e52db8a2349e1f1b64e50790dc3bb6afe08ec7.tar.gz kernel-59e52db8a2349e1f1b64e50790dc3bb6afe08ec7.tar.xz kernel-59e52db8a2349e1f1b64e50790dc3bb6afe08ec7.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc1.20211119git4c388a8e740d.17.vanilla.1.fc36kernel-5.16.0-0.rc1.20211119git4c388a8e740d.17.vanilla.1.fc35kernel-5.16.0-0.rc1.20211119git4c388a8e740d.17.vanilla.1.fc34kernel-5.16.0-0.rc1.20211119git4c388a8e740d.17.vanilla.1.fc33
Diffstat (limited to 'patch-5.16-redhat.patch')
| -rw-r--r-- | patch-5.16-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index a4768a413..492fbda94 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -545,7 +545,7 @@ index c68e694fca26..146cba5ae5bc 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index a50f1967c73d..faeecb8bc471 100644 +index 2c80765670bc..5245fad951d8 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1725,6 +1725,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -2664,7 +2664,7 @@ index 186c49582f45..7bbf1c3801f9 100644 obj-$(CONFIG_MODULES) += kmod.o obj-$(CONFIG_MULTIUSER) += groups.o diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 50f96ea4452a..4f2f992de1aa 100644 +index 1033ee8c0caf..f2e6d22a5645 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ |