From 8907016b22e29d93816faa121246816ce92e320e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 1 Aug 2022 07:51:46 +0100
Subject: [PATCH] linuxHeaders: 5.18 -> 5.19

---
 pkgs/os-specific/linux/kernel-headers/default.nix |  7 ++-----
 .../kernel-headers/restore-__bitwise__.patch      | 15 ---------------
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel-headers/restore-__bitwise__.patch

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 5b2fb62cb95..daa8c1ae201 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -84,18 +84,15 @@ let
 in {
   inherit makeLinuxHeaders;
 
-  linuxHeaders = let version = "5.18"; in
+  linuxHeaders = let version = "5.19"; in
     makeLinuxHeaders {
       inherit version;
       src = fetchurl {
         url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-        sha256 = "1vjwhl4s8qxfg1aabn8xnpjza3qzrjcp5450h9qpjvl999lg3wsi";
+        sha256 = "1a05a3hw4w3k530mxhns96xw7hag743xw5w967yazqcykdbhq97z";
       };
       patches = [
          ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
-
-         # 5.19 backport. Can be removed on update.
-         ./restore-__bitwise__.patch
       ];
     };
 }
diff --git a/pkgs/os-specific/linux/kernel-headers/restore-__bitwise__.patch b/pkgs/os-specific/linux/kernel-headers/restore-__bitwise__.patch
deleted file mode 100644
index 67d2af8fc3b..00000000000
--- a/pkgs/os-specific/linux/kernel-headers/restore-__bitwise__.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/torvalds/linux/commit/caa28984163cb63ea0be4cb8dbf05defdc7303f9
-
-Fixes openiscsi build.
---- a/include/uapi/linux/types.h
-+++ b/include/uapi/linux/types.h
-@@ -26,6 +26,9 @@
- #define __bitwise
- #endif
- 
-+/* The kernel doesn't use this legacy form, but user space does */
-+#define __bitwise__ __bitwise
-+
- typedef __u16 __bitwise __le16;
- typedef __u16 __bitwise __be16;
- typedef __u32 __bitwise __le32;