diff --git a/debian/changelog b/debian/changelog
index 55db71af2..f0a224800 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-linux (4.15~rc8-1~exp2) UNRELEASED; urgency=medium
+linux (4.15-1~exp1) UNRELEASED; urgency=medium
+
+  * New upstream release: https://kernelnewbies.org/Linux_4.15
 
   [ Bastian Blank ]
   * Add cloud-amd64 kernel flavour.
diff --git a/debian/patches/bugfix/all/nfsd-auth-Fix-gid-sorting-when-rootsquash-enabled.patch b/debian/patches/bugfix/all/nfsd-auth-Fix-gid-sorting-when-rootsquash-enabled.patch
deleted file mode 100644
index c2e3cc858..000000000
--- a/debian/patches/bugfix/all/nfsd-auth-Fix-gid-sorting-when-rootsquash-enabled.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Ben Hutchings <ben.hutchings@codethink.co.uk>
-Date: Mon, 22 Jan 2018 20:11:06 +0000
-Subject: nfsd: auth: Fix gid sorting when rootsquash enabled
-Origin: https://git.kernel.org/linus/1995266727fa8143897e89b55f5d3c79aa828420
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-1000028
-
-Commit bdcf0a423ea1 ("kernel: make groups_sort calling a responsibility
-group_info allocators") appears to break nfsd rootsquash in a pretty
-major way.
-
-It adds a call to groups_sort() inside the loop that copies/squashes
-gids, which means the valid gids are sorted along with the following
-garbage.  The net result is that the highest numbered valid gids are
-replaced with any lower-valued garbage gids, possibly including 0.
-
-We should sort only once, after filling in all the gids.
-
-Fixes: bdcf0a423ea1 ("kernel: make groups_sort calling a responsibility ...")
-Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
-Acked-by: J. Bruce Fields <bfields@redhat.com>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- fs/nfsd/auth.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
-index f650e475d8f0..fdf2aad73470 100644
---- a/fs/nfsd/auth.c
-+++ b/fs/nfsd/auth.c
-@@ -60,10 +60,10 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
- 				gi->gid[i] = exp->ex_anon_gid;
- 			else
- 				gi->gid[i] = rqgi->gid[i];
--
--			/* Each thread allocates its own gi, no race */
--			groups_sort(gi);
- 		}
-+
-+		/* Each thread allocates its own gi, no race */
-+		groups_sort(gi);
- 	} else {
- 		gi = get_group_info(rqgi);
- 	}
--- 
-2.11.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 2dd55cfcf..a170a26a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -121,7 +121,6 @@ debian/i386-686-pae-pci-set-pci-nobios-by-default.patch
 bugfix/all/media-dvb-usb-v2-lmedm04-Improve-logic-checking-of-w.patch
 bugfix/all/media-dvb-usb-v2-lmedm04-move-ts2020-attach-to-dm04_.patch
 bugfix/all/media-hdpvr-fix-an-error-handling-path-in-hdpvr_prob.patch
-bugfix/all/nfsd-auth-Fix-gid-sorting-when-rootsquash-enabled.patch
 
 # Fix exported symbol versions
 bugfix/all/module-disable-matching-missing-version-crc.patch