Merge "Update to kernel headers v5.2.11."temp_140451723

am: e2c10d8de0

Change-Id: I1dc284be7b04d4894ad98156e245c2d74004cb0d

5 files changed, 17 insertions, 25 deletions

diff --git a/libc/kernel/uapi/linux/coda_psdev.h b/libc/kernel/uapi/linux/coda_psdev.h
index 388096103..7850db6d3 100644
--- a/libc/kernel/uapi/linux/coda_psdev.h
+++ b/libc/kernel/uapi/linux/coda_psdev.h
@@ -21,16 +21,6 @@
 #include <linux/magic.h>
 #define CODA_PSDEV_MAJOR 67
 #define MAX_CODADEVS 5
-struct upc_req {
-  struct list_head uc_chain;
-  caddr_t uc_data;
-  u_short uc_flags;
-  u_short uc_inSize;
-  u_short uc_outSize;
-  u_short uc_opcode;
-  int uc_unique;
-  wait_queue_head_t uc_sleep;
-};
 #define CODA_REQ_ASYNC 0x1
 #define CODA_REQ_READ 0x2
 #define CODA_REQ_WRITE 0x4
diff --git a/libc/kernel/uapi/linux/nl80211.h b/libc/kernel/uapi/linux/nl80211.h
index 93b219690..12b37ae91 100644
--- a/libc/kernel/uapi/linux/nl80211.h
+++ b/libc/kernel/uapi/linux/nl80211.h
@@ -502,7 +502,7 @@ enum nl80211_attrs {
 #define NL80211_HT_CAPABILITY_LEN 26
 #define NL80211_VHT_CAPABILITY_LEN 12
 #define NL80211_HE_MIN_CAPABILITY_LEN 16
-#define NL80211_HE_MAX_CAPABILITY_LEN 51
+#define NL80211_HE_MAX_CAPABILITY_LEN 54
 #define NL80211_MAX_NR_CIPHER_SUITES 5
 #define NL80211_MAX_NR_AKM_SUITES 2
 #define NL80211_MIN_REMAIN_ON_CHANNEL_TIME 10
diff --git a/libc/kernel/uapi/linux/version.h b/libc/kernel/uapi/linux/version.h
index 94bf4ba5e..ab29f91a2 100644
--- a/libc/kernel/uapi/linux/version.h
+++ b/libc/kernel/uapi/linux/version.h
@@ -16,5 +16,5 @@
  ***
  ****************************************************************************
  ****************************************************************************/
-#define LINUX_VERSION_CODE 328198
+#define LINUX_VERSION_CODE 328203
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/libc/kernel/uapi/sound/sof/fw.h b/libc/kernel/uapi/sound/sof/fw.h
index 72bb31c21..c36c2b99a 100644
--- a/libc/kernel/uapi/sound/sof/fw.h
+++ b/libc/kernel/uapi/sound/sof/fw.h
@@ -18,6 +18,7 @@
  ****************************************************************************/
 #ifndef __INCLUDE_UAPI_SOF_FW_H__
 #define __INCLUDE_UAPI_SOF_FW_H__
+#include <linux/types.h>
 #define SND_SOF_FW_SIG_SIZE 4
 #define SND_SOF_FW_ABI 1
 #define SND_SOF_FW_SIG "Reef"
@@ -43,8 +44,8 @@ enum snd_sof_fw_blk_type {
 };
 struct snd_sof_blk_hdr {
   enum snd_sof_fw_blk_type type;
-  uint32_t size;
-  uint32_t offset;
+  __u32 size;
+  __u32 offset;
 } __packed;
 enum snd_sof_fw_mod_type {
   SOF_FW_BASE = 0,
@@ -52,13 +53,13 @@ enum snd_sof_fw_mod_type {
 };
 struct snd_sof_mod_hdr {
   enum snd_sof_fw_mod_type type;
-  uint32_t size;
-  uint32_t num_blocks;
+  __u32 size;
+  __u32 num_blocks;
 } __packed;
 struct snd_sof_fw_header {
   unsigned char sig[SND_SOF_FW_SIG_SIZE];
-  uint32_t file_size;
-  uint32_t num_modules;
-  uint32_t abi;
+  __u32 file_size;
+  __u32 num_modules;
+  __u32 abi;
 } __packed;
 #endif
diff --git a/libc/kernel/uapi/sound/sof/header.h b/libc/kernel/uapi/sound/sof/header.h
index cf90e9bcc..3fbd4a440 100644
--- a/libc/kernel/uapi/sound/sof/header.h
+++ b/libc/kernel/uapi/sound/sof/header.h
@@ -18,12 +18,13 @@
  ****************************************************************************/
 #ifndef __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__
 #define __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__
+#include <linux/types.h>
 struct sof_abi_hdr {
-  uint32_t magic;
-  uint32_t type;
-  uint32_t size;
-  uint32_t abi;
-  uint32_t reserved[4];
-  uint32_t data[0];
+  __u32 magic;
+  __u32 type;
+  __u32 size;
+  __u32 abi;
+  __u32 reserved[4];
+  __u32 data[0];
 } __packed;
 #endif