Merge pull request #15 from AdityaGarg8/main

Fix fuzz 2 on 0001 and 8002 patch.
This commit is contained in:
James Lambert
2021-09-04 06:30:43 +01:00
committed by GitHub
4 changed files with 5 additions and 7 deletions
@@ -67,8 +67,8 @@ index c675fdbd3dce..9266039e28e4 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -97,6 +97,10 @@
#include <linux/scs.h>
#include <linux/io_uring.h>
#include <linux/bpf.h>
+#ifdef CONFIG_USER_NS
+#include <linux/user_namespace.h>
+1 -3
View File
@@ -25,10 +25,8 @@ index 6c39415a69d6..d2392a8fdbbb 100644
+ case BRCM_CC_4377_CHIP_ID:
+ return 0x170000;
case BRCM_CC_4378_CHIP_ID:
return 0x352000;
return 0x352000;
default:
brcmf_err("unknown chip: %s\n", ci->pub.name);
break;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
index 60e3b0ce4fd7..a262e2eb36af 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+2 -2
View File
@@ -239,7 +239,7 @@ done
md5sums=('392cd7526637b3cbdf9de748d9a9008e'
'SKIP'
'51da5decbd818529bab615a9a52d800e'
'080dee4dd14a43c2c131aa907b5a6045'
'31b889cb5a46adee6a9f9324d3177e33'
'a0b6081a5f114a0bf6241bd131f3b360'
'4e95da49152e777a7451f8ff3034070b'
'7d09991a37cffaf38f0241b43668333f'
@@ -260,6 +260,6 @@ md5sums=('392cd7526637b3cbdf9de748d9a9008e'
'6b5c2b02c39db21a9fe5c198794059d4'
'b1d2a8aca562ad2bd6ff0bcb48fcbc70'
'7bc42e89f69e546abae185742609ca76'
'7fa951078b1710bda14dbc778e57003f'
'f2df4dc9f670111577d93e3bc6b63def'
'ad2552bc11f7fd9d57ccda27272fee44'
'41911438d2c769d064f6b58cc1c7f83f')
+1 -1
View File
@@ -1,4 +1,4 @@
mbp-16.1-linux-wifi - 5.13.12
mbp-16.1-linux-wifi - 5.13.13
==============
Arch Linux package for Linux kernel with bleeding edge 2018+ MacBook Pro support.