From 2e78cf03a47eba82394cc9605727ddb93feb317a Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 12 Feb 2018 15:10:47 +0100
Subject: [PATCH] build: support for Linux 4.16

---
 INSTALL           | 7 ++++---
 configure.ac      | 2 +-
 doc/changelog.txt | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/INSTALL b/INSTALL
index 49342b9..9678fa5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,16 +12,17 @@ in combination with the kernel's Kbuild system.
 Supported configurations for this release
 =========================================
 
-	* iptables >= 1.4.5
+	* iptables >= 1.6.0
 
-	* kernel-devel >= 3.7
+	* kernel-devel >= 4.15
 	  with prepared build/output directory
 	  - CONFIG_NF_CONNTRACK
 	  - CONFIG_NF_CONNTRACK_MARK enabled =y or as module (=m)
 	  - CONFIG_CONNECTOR y/m if you wish to receive userspace
 	    notifications from pknock through netlink/connector
 
-(Use xtables-addons-1.x if you need support for Linux < 3.7.)
+(Use xtables-addons-1.x if you need support for Linux < 3.7.
+Use xtables-addons-2.x if you need support for Linux < 4.15.)
 
 
 Selecting extensions
diff --git a/configure.ac b/configure.ac
index 290b92a..e4b7011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ if test -n "$kbuilddir"; then
 		echo "WARNING: Version detection did not succeed. Continue at own luck.";
 	else
 		echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
-		if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 15; then
+		if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 16; then
 			echo "WARNING: That kernel version is not officially supported yet. Continue at own luck.";
 		elif test "$kmajor" -eq 4 -a "$kminor" -ge 15; then
 			:
diff --git a/doc/changelog.txt b/doc/changelog.txt
index 18c9bf7..85899b8 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,7 +2,7 @@
 HEAD
 ====
 Enhancements:
-- support for Linux up to 4.15
+- support for Linux 4.15, 4.16
 Changes:
 - remove support for Linux 3.7--4.14