diff --git a/patches/WireGuard/0001-merge-WireGuard.patch b/patches/WireGuard/0001-merge-WireGuard.patch index 709b9ef72dd7e6bae07cb60655925ef993ec9a03..4b42ad627ffda68823c11c95153a2929350894a8 100644 --- a/patches/WireGuard/0001-merge-WireGuard.patch +++ b/patches/WireGuard/0001-merge-WireGuard.patch @@ -1,6 +1,6 @@ -From 2bf00565c7ce3ae7d734627f535a9abfcabeda67 Mon Sep 17 00:00:00 2001 +From d7b75b2d24ad56b112d5cd1ded5375704a406f46 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Sun, 24 Jun 2018 11:00:22 -0500 +Date: Sun, 1 Jul 2018 19:33:41 -0500 Subject: [PATCH] merge: WireGuard Signed-off-by: Robert Nelson <robertcnelson@gmail.com> @@ -34464,11 +34464,11 @@ index 000000000000..8b8a1f254bb6 +#endif /* _WG_UAPI_WIREGUARD_H */ diff --git a/net/wireguard/version.h b/net/wireguard/version.h new file mode 100644 -index 000000000000..aeb04739a6d7 +index 000000000000..71eb87e3d02f --- /dev/null +++ b/net/wireguard/version.h @@ -0,0 +1 @@ -+#define WIREGUARD_VERSION "0.0.20180620" ++#define WIREGUARD_VERSION "0.0.20180625" -- 2.18.0 diff --git a/patches/aufs4/0001-merge-aufs4-kbuild.patch b/patches/aufs4/0001-merge-aufs4-kbuild.patch index b83e4fa78a7452e295f76e9ba5c3b4e318c5e687..4c6eb35315280ed272bc32a0354b68fbdd75f277 100644 --- a/patches/aufs4/0001-merge-aufs4-kbuild.patch +++ b/patches/aufs4/0001-merge-aufs4-kbuild.patch @@ -1,6 +1,6 @@ -From 322137d7bc2b35c737c5662f8a0a1a11bd1a7e08 Mon Sep 17 00:00:00 2001 +From eeaf345a0148b9da177f52b7cdaaa3a16ca0a992 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Sat, 16 Jun 2018 11:06:52 -0500 +Date: Sun, 1 Jul 2018 09:07:26 -0500 Subject: [PATCH 1/5] merge: aufs4-kbuild Signed-off-by: Robert Nelson <robertcnelson@gmail.com> @@ -31,5 +31,5 @@ index c9375fd2c8c4..8af56710f1cd 100644 obj-$(CONFIG_EFIVAR_FS) += efivarfs/ +obj-$(CONFIG_AUFS_FS) += aufs/ -- -2.17.1 +2.18.0 diff --git a/patches/aufs4/0002-merge-aufs4-base.patch b/patches/aufs4/0002-merge-aufs4-base.patch index 3dd2c43827145d1053e0dbfe04171b0c5086f37e..2728a7a65d0aa674ed0a142f56f6c2f856e090dc 100644 --- a/patches/aufs4/0002-merge-aufs4-base.patch +++ b/patches/aufs4/0002-merge-aufs4-base.patch @@ -1,6 +1,6 @@ -From c2f544f0144bde34377df302b1993aa38b50bc6e Mon Sep 17 00:00:00 2001 +From 371780ab5022bda251ad6555e8b6f90666d9b38c Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Sat, 16 Jun 2018 11:06:52 -0500 +Date: Sun, 1 Jul 2018 09:07:26 -0500 Subject: [PATCH 2/5] merge: aufs4-base Signed-off-by: Robert Nelson <robertcnelson@gmail.com> @@ -352,5 +352,5 @@ index 023386338269..06e0d7a2eeb1 100644 #ifdef CONFIG_LOCK_STAT static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats); -- -2.17.1 +2.18.0 diff --git a/patches/aufs4/0003-merge-aufs4-mmap.patch b/patches/aufs4/0003-merge-aufs4-mmap.patch index 9453d4b6f42654c6ef22e9933537c57c8f5c13be..c551e03f534617793eacb3dec9eaa96e4eadd27a 100644 --- a/patches/aufs4/0003-merge-aufs4-mmap.patch +++ b/patches/aufs4/0003-merge-aufs4-mmap.patch @@ -1,6 +1,6 @@ -From e11667189e9e743262876fe8becf1024938d0764 Mon Sep 17 00:00:00 2001 +From baf800623f8645b3eff4bbc08757b5cc52bda570 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Sat, 16 Jun 2018 11:06:53 -0500 +Date: Sun, 1 Jul 2018 09:07:27 -0500 Subject: [PATCH 3/5] merge: aufs4-mmap Signed-off-by: Robert Nelson <robertcnelson@gmail.com> @@ -416,5 +416,5 @@ index 000000000000..14efc4f64075 +} +#endif /* !CONFIG_MMU */ -- -2.17.1 +2.18.0 diff --git a/patches/aufs4/0004-merge-aufs4-standalone.patch b/patches/aufs4/0004-merge-aufs4-standalone.patch index 8373a539f52896111c727a052816333362bb9e65..c259e078beab5d09eb074e1c035e96e05ce8c41b 100644 --- a/patches/aufs4/0004-merge-aufs4-standalone.patch +++ b/patches/aufs4/0004-merge-aufs4-standalone.patch @@ -1,6 +1,6 @@ -From d7c08025ee3c3aa07aea25c2ad128eee066515c0 Mon Sep 17 00:00:00 2001 +From 1f480e34da907ed0b0e898e81804deb9824cc9f8 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Sat, 16 Jun 2018 11:06:54 -0500 +Date: Sun, 1 Jul 2018 09:07:27 -0500 Subject: [PATCH 4/5] merge: aufs4-standalone Signed-off-by: Robert Nelson <robertcnelson@gmail.com> @@ -459,5 +459,5 @@ index 7bc2fde023a7..6bd0468e4c78 100644 int security_mmap_addr(unsigned long addr) { -- -2.17.1 +2.18.0 diff --git a/patches/aufs4/0005-merge-aufs4.patch b/patches/aufs4/0005-merge-aufs4.patch index 1b5c210195bbdb96951a352a358ca9a43861b8ed..d37426296fe0ae694de0107eadc7ab9a96de0965 100644 --- a/patches/aufs4/0005-merge-aufs4.patch +++ b/patches/aufs4/0005-merge-aufs4.patch @@ -1,6 +1,6 @@ -From a573da02a3c28546c3136e978d5f12cfc93d8b70 Mon Sep 17 00:00:00 2001 +From ee8da2facc9b37a27354f30628fbee92a3b243e6 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Sat, 16 Jun 2018 11:06:55 -0500 +Date: Sun, 1 Jul 2018 09:07:28 -0500 Subject: [PATCH 5/5] merge: aufs4 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> @@ -37586,5 +37586,5 @@ index 000000000000..fbb47dec12d6 + +#endif /* __AUFS_TYPE_H__ */ -- -2.17.1 +2.18.0 diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig index d2b889f597dec796d4e608e49f05014d1e0b19f2..fb2ded0814bfb7f7c76a101b0fc2b84c0dc2a1f5 100644 --- a/patches/ref_omap2plus_defconfig +++ b/patches/ref_omap2plus_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.18.0-rc2 Kernel Configuration +# Linux/arm 4.18.0-rc3 Kernel Configuration # # diff --git a/version.sh b/version.sh index 97ad049c646d8ccd384fb9a4de55689e03e6e977..67f1041301f56ece0a9c7b4f28fc8467778255d5 100644 --- a/version.sh +++ b/version.sh @@ -30,7 +30,7 @@ toolchain="gcc_linaro_gnueabihf_7" #Kernel KERNEL_REL=4.18 -KERNEL_TAG=${KERNEL_REL}-rc2 +KERNEL_TAG=${KERNEL_REL}-rc3 kernel_rt=".X-rtY" #Kernel Build BUILD=${build_prefix}1