diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-07 19:43:40 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-07 19:43:40 +0100 |
| commit | a3400e01314ce124780859b18e4f3a61207b95a6 (patch) | |
| tree | dd3c8d96583bd053e22469b2859bd6a6557b7cf2 | |
| parent | aa3eb4405ab04cc137aeb51229bb7f9105866864 (diff) | |
| parent | 4f4c8c10379696c972a324ab99be39e427cdfcde (diff) | |
| download | kernel-a3400e01314ce124780859b18e4f3a61207b95a6.tar.gz kernel-a3400e01314ce124780859b18e4f3a61207b95a6.tar.xz kernel-a3400e01314ce124780859b18e4f3a61207b95a6.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
| -rw-r--r-- | 0001-Fix-from-Arnd-for-compilation-error.patch | 27 | ||||
| -rw-r--r-- | kernel.spec | 3 |
2 files changed, 30 insertions, 0 deletions
diff --git a/0001-Fix-from-Arnd-for-compilation-error.patch b/0001-Fix-from-Arnd-for-compilation-error.patch new file mode 100644 index 000000000..6b9d7e2a0 --- /dev/null +++ b/0001-Fix-from-Arnd-for-compilation-error.patch @@ -0,0 +1,27 @@ +From 4bab8719d0712b13063cdd0c0a3d24984bcd8b1f Mon Sep 17 00:00:00 2001 +From: Laura Abbott <labbott@redhat.com> +Date: Thu, 7 Mar 2019 10:37:06 -0800 +Subject: [PATCH] Fix from Arnd for compilation error + +Signed-off-by: Laura Abbott <labbott@redhat.com> +--- + include/uapi/asm-generic/socket.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h +index c8b430cb6dc4..8c1391c89171 100644 +--- a/include/uapi/asm-generic/socket.h ++++ b/include/uapi/asm-generic/socket.h +@@ -2,8 +2,8 @@ + #ifndef __ASM_GENERIC_SOCKET_H + #define __ASM_GENERIC_SOCKET_H + ++#include <linux/posix_types.h> + #include <asm/sockios.h> +-#include <asm/bitsperlong.h> + + /* For setsockopt(2) */ + #define SOL_SOCKET 1 +-- +2.20.1 + diff --git a/kernel.spec b/kernel.spec index 7f2aa9d52..7e2a2c54f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -629,6 +629,9 @@ Patch509: i915-enable-fastboot-on-skylake.patch # fastboot by default on VLV/CHV (BYT/CHT), queued in -next for merging into 5.1 Patch510: i915-enable-fastboot-on-vlv-chv.patch +# rhbz 1686419 +Patch511: 0001-Fix-from-Arnd-for-compilation-error.patch + # END OF PATCH DEFINITIONS %endif |