Update Debian kernel to v6.0.1
This commit is contained in:
Maximilian Luz
parent
2f307dcfec
commit
42d5c4c8d8
2
.github/workflows/debian.yml
vendored
2
.github/workflows/debian.yml
vendored
|
|
@ -7,7 +7,7 @@ name: Debian
|
|||
|
||||
env:
|
||||
GPG_KEY_ID: 56C464BAAC421453
|
||||
KERNEL_VERSION: 5.19.13
|
||||
KERNEL_VERSION: 6.0.1
|
||||
KERNEL_REVISION: 1
|
||||
LOCALVERSION: -surface
|
||||
MAINLINE_REPO: git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 26b723079391b268d79612ae4bcca0a9e613ea9d Mon Sep 17 00:00:00 2001
|
||||
From 26b30d0e613aa61df7cb5105c52a68f254b52c01 Mon Sep 17 00:00:00 2001
|
||||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Mon, 7 Sep 2020 02:51:53 +0100
|
||||
Subject: [PATCH 1/2] Export symbols needed by Android drivers
|
||||
|
|
@ -32,17 +32,17 @@ index 3bcc1ecc314a..6ff78a4c27a9 100644
|
|||
void do_close_on_exec(struct files_struct *files)
|
||||
{
|
||||
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
|
||||
index d4af56927a4d..ebff11e343fd 100644
|
||||
index ee28253c9ac0..37667d4aaac7 100644
|
||||
--- a/kernel/sched/core.c
|
||||
+++ b/kernel/sched/core.c
|
||||
@@ -7036,6 +7036,7 @@ int can_nice(const struct task_struct *p, const int nice)
|
||||
{
|
||||
return is_nice_reduction(p, nice) || capable(CAP_SYS_NICE);
|
||||
@@ -7052,6 +7052,7 @@ static bool is_nice_reduction(const struct task_struct *p, const int nice)
|
||||
|
||||
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE));
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(can_nice);
|
||||
|
||||
#ifdef __ARCH_WANT_SYS_NICE
|
||||
|
||||
/*
|
||||
* can_nice - check if a task can reduce its nice value
|
||||
diff --git a/kernel/sched/wait.c b/kernel/sched/wait.c
|
||||
index 9860bb9a847c..ad76d49bf4e1 100644
|
||||
--- a/kernel/sched/wait.c
|
||||
|
|
@ -68,10 +68,10 @@ index dff75bcde151..5f9a42a388f1 100644
|
|||
/**
|
||||
* task_work_cancel_match - cancel a pending work added by task_work_add()
|
||||
diff --git a/mm/memory.c b/mm/memory.c
|
||||
index 1c6027adc542..75372d105b0e 100644
|
||||
index a78814413ac0..c48cca22b9f4 100644
|
||||
--- a/mm/memory.c
|
||||
+++ b/mm/memory.c
|
||||
@@ -1749,6 +1749,7 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long start,
|
||||
@@ -1757,6 +1757,7 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long start,
|
||||
mmu_notifier_invalidate_range_end(&range);
|
||||
tlb_finish_mmu(&tlb);
|
||||
}
|
||||
|
|
@ -80,10 +80,10 @@ index 1c6027adc542..75372d105b0e 100644
|
|||
/**
|
||||
* zap_page_range_single - remove user pages in a given range
|
||||
diff --git a/mm/shmem.c b/mm/shmem.c
|
||||
index f152375e770b..ccc1633695fe 100644
|
||||
index 42e5888bf84d..afa1c0999644 100644
|
||||
--- a/mm/shmem.c
|
||||
+++ b/mm/shmem.c
|
||||
@@ -4173,6 +4173,7 @@ int shmem_zero_setup(struct vm_area_struct *vma)
|
||||
@@ -4245,6 +4245,7 @@ int shmem_zero_setup(struct vm_area_struct *vma)
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -92,7 +92,7 @@ index f152375e770b..ccc1633695fe 100644
|
|||
/**
|
||||
* shmem_read_mapping_page_gfp - read into page cache, using specified page allocation flags.
|
||||
diff --git a/security/security.c b/security/security.c
|
||||
index 8b62654ff3f9..67670e24fcbc 100644
|
||||
index 4b95de24bc8d..515d9509c001 100644
|
||||
--- a/security/security.c
|
||||
+++ b/security/security.c
|
||||
@@ -752,24 +752,28 @@ int security_binder_set_context_mgr(const struct cred *mgr)
|
||||
|
|
@ -125,5 +125,5 @@ index 8b62654ff3f9..67670e24fcbc 100644
|
|||
int security_ptrace_access_check(struct task_struct *child, unsigned int mode)
|
||||
{
|
||||
--
|
||||
2.37.3
|
||||
2.38.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 6c232a01f28a1dc9f69e14a9599a9c8ccebe7e28 Mon Sep 17 00:00:00 2001
|
||||
From 2ad8da4c6f2924447824cfae9a1aafb78c0caaee Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Fri, 26 Aug 2022 21:24:36 +0200
|
||||
Subject: [PATCH] Revert "integrity: Only use machine keyring when
|
||||
|
|
@ -98,5 +98,5 @@ index 7aaed7950b6e..09fd8f20c756 100644
|
|||
- return trust_mok;
|
||||
-}
|
||||
--
|
||||
2.37.3
|
||||
2.38.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 62fe4204b83f0694c83a9f2826fd5dfa0c3fcb18 Mon Sep 17 00:00:00 2001
|
||||
From de94f5f892e13432abc0be24aac6fc0c34aed461 Mon Sep 17 00:00:00 2001
|
||||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Fri, 22 Jun 2018 17:27:00 +0100
|
||||
Subject: [PATCH 2/2] android: Enable building ashmem and binder as modules
|
||||
|
|
@ -26,11 +26,11 @@ Consequently, the ashmem part of this patch has been removed.
|
|||
3 files changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
|
||||
index 53b22e26266c..f3c50236e8d1 100644
|
||||
index 07aa8ae0a058..94a3a86f9bd4 100644
|
||||
--- a/drivers/android/Kconfig
|
||||
+++ b/drivers/android/Kconfig
|
||||
@@ -9,7 +9,7 @@ config ANDROID
|
||||
if ANDROID
|
||||
@@ -2,7 +2,7 @@
|
||||
menu "Android"
|
||||
|
||||
config ANDROID_BINDER_IPC
|
||||
- bool "Android Binder IPC Driver"
|
||||
|
|
@ -54,7 +54,7 @@ index c9d3d0c99c25..55411d9a9c2a 100644
|
|||
+binder_linux-$(CONFIG_ANDROID_BINDERFS) += binderfs.o
|
||||
+binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
|
||||
diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
|
||||
index 53797453a6ee..a1872c2be290 100644
|
||||
index 9b1778c00610..48afb2c5b8bf 100644
|
||||
--- a/drivers/android/binder_alloc.c
|
||||
+++ b/drivers/android/binder_alloc.c
|
||||
@@ -38,7 +38,7 @@ enum {
|
||||
|
|
@ -67,5 +67,5 @@ index 53797453a6ee..a1872c2be290 100644
|
|||
|
||||
#define binder_alloc_debug(mask, x...) \
|
||||
--
|
||||
2.37.3
|
||||
2.38.0
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue