diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-20 21:42:10 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-20 21:42:10 +0200 |
| commit | 8efc28864e86fc7d40cb1b1ef35cc39e13532d5f (patch) | |
| tree | de930ac0ebc713c0985d8203bd27374c5355a559 /patch-5.7.0-redhat.patch | |
| parent | 12d9738bd2056d5dc180ece04b6fe7ceb5056d4c (diff) | |
| parent | 0c5dccebb58945a1d0e7f3a660acf24b9ffbf223 (diff) | |
| download | kernel-5.7.0-0.rc2.1.vanilla.1.fc30.tar.gz kernel-5.7.0-0.rc2.1.vanilla.1.fc30.tar.xz kernel-5.7.0-0.rc2.1.vanilla.1.fc30.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc2.1.vanilla.1.fc33kernel-5.7.0-0.rc2.1.vanilla.1.fc32kernel-5.7.0-0.rc2.1.vanilla.1.fc31kernel-5.7.0-0.rc2.1.vanilla.1.fc30
Diffstat (limited to 'patch-5.7.0-redhat.patch')
| -rw-r--r-- | patch-5.7.0-redhat.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patch-5.7.0-redhat.patch b/patch-5.7.0-redhat.patch index b6b70fdaf..099aa5ca5 100644 --- a/patch-5.7.0-redhat.patch +++ b/patch-5.7.0-redhat.patch @@ -253,7 +253,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 70def4907036..1b92fd19b0c5 100644 +index 49b2709ff44e..e6e36dcbebfb 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,10 @@ NAME = Kleptomaniac Octopus @@ -3167,7 +3167,7 @@ index 4cb4130ced32..b1010f42dd18 100644 obj-$(CONFIG_MULTIUSER) += groups.o diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 64783da34202..146002310855 100644 +index d85f37239540..28ed55c3dd18 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ @@ -3205,7 +3205,7 @@ index 64783da34202..146002310855 100644 static const struct bpf_map_ops * const bpf_map_types[] = { #define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type) -@@ -3661,11 +3680,17 @@ static int link_update(union bpf_attr *attr) +@@ -3659,11 +3678,17 @@ static int link_update(union bpf_attr *attr) SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size) { union bpf_attr attr; |