Linux v4.16.6

4 files changed, 5 insertions, 154 deletions

diff --git a/ACPI-video-Only-default-only_lcd-to-true-on-Win8-ready-_desktops_.patch b/ACPI-video-Only-default-only_lcd-to-true-on-Win8-ready-_desktops_.patch
deleted file mode 100644
index 0c1f14015..000000000
--- a/ACPI-video-Only-default-only_lcd-to-true-on-Win8-ready-_desktops_.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From patchwork Tue Apr 17 16:23:50 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: ACPI / video: Only default only_lcd to true on Win8-ready _desktops_
-From: Hans de Goede <hdegoede@redhat.com>
-X-Patchwork-Id: 10345845
-Message-Id: <20180417162350.12227-1-hdegoede@redhat.com>
-To: "Rafael J . Wysocki" <rjw@rjwysocki.net>, Len Brown <lenb@kernel.org>
-Cc: Hans de Goede <hdegoede@redhat.com>,
- Zhang Rui <rui.zhang@intel.com>, linux-acpi@vger.kernel.org,
- James Hogan <jhogan@kernel.org>
-Date: Tue, 17 Apr 2018 18:23:50 +0200
-
-Commit 5928c281524f ("ACPI / video: Default lcd_only to true on Win8-ready
-and newer machines") made only_lcd default to true on all machines where
-acpi_osi_is_win8() returns true, including laptops.
-
-The purpose of this is to avoid the bogus / non-working acpi backlight
-interface which many newer BIOS-es define on desktop machines.
-
-But this is causing a regression on some laptops, specifically on the
-Dell XPS 13 2013 model, which does not have the LCD flag set for its
-fully functional ACPI backlight interface.
-
-Rather then DMI quirking our way out of this, this commits changes the
-logic for setting only_lcd to true, to only do this on machines with
-a desktop (or server) dmi chassis-type.
-
-Note that we cannot simply only check the chassis-type and not register
-the backlight interface based on that as there are some laptops and
-tablets which have their chassis-type set to "3" aka desktop. Hopefully
-the combination of checking the LCD flag, but only on devices with
-a desktop(ish) chassis-type will avoid the needs for DMI quirks for this,
-or at least limit the amount of DMI quirks which we need to a minimum.
-
-Cc: James Hogan <jhogan@kernel.org>
-Reported-and-tested-by: James Hogan <jhogan@kernel.org>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/acpi/acpi_video.c | 27 +++++++++++++++++++++++++--
- 1 file changed, 25 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
-index 76fb96966f7b..2f2e737be0f8 100644
---- a/drivers/acpi/acpi_video.c
-+++ b/drivers/acpi/acpi_video.c
-@@ -2123,6 +2123,25 @@ static int __init intel_opregion_present(void)
- 	return opregion;
- }
- 
-+static bool dmi_is_desktop(void)
-+{
-+	const char *chassis_type;
-+
-+	chassis_type = dmi_get_system_info(DMI_CHASSIS_TYPE);
-+	if (!chassis_type)
-+		return false;
-+
-+	if (!strcmp(chassis_type, "3") || /*  3: Desktop */
-+	    !strcmp(chassis_type, "4") || /*  4: Low Profile Desktop */
-+	    !strcmp(chassis_type, "5") || /*  5: Pizza Box */
-+	    !strcmp(chassis_type, "6") || /*  6: Mini Tower */
-+	    !strcmp(chassis_type, "7") || /*  7: Tower */
-+	    !strcmp(chassis_type, "11"))  /* 11: Main Server Chassis */
-+		return true;
-+
-+	return false;
-+}
-+
- int acpi_video_register(void)
- {
- 	int ret = 0;
-@@ -2143,8 +2162,12 @@ int acpi_video_register(void)
- 	 * win8 ready (where we also prefer the native backlight driver, so
- 	 * normally the acpi_video code should not register there anyways).
- 	 */
--	if (only_lcd == -1)
--		only_lcd = acpi_osi_is_win8();
-+	if (only_lcd == -1) {
-+		if (dmi_is_desktop() && acpi_osi_is_win8())
-+			only_lcd = true;
-+		else
-+			only_lcd = false;
-+	}
- 
- 	dmi_check_system(video_dmi_table);
- 
diff --git a/kernel.spec b/kernel.spec
index ce1b22821..eb7c78060 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 5
+%define stable_update 6
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -657,13 +657,6 @@ Patch503: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
 # rhbz 1549316
 Patch504: ipmi-fixes.patch
 
-# rhbz 1566510
-Patch505: net-Revert-macsec-missing-dev_put-on-error-in-macsec_newlink.patch
-
-# rhbz 1571036
-# https://patchwork.kernel.org/patch/10345845/
-Patch506: ACPI-video-Only-default-only_lcd-to-true-on-Win8-ready-_desktops_.patch
-
 # rhbz 1565131
 Patch507: xhci-Fix-Kernel-oops-in-xhci-dbgtty.patch
 
@@ -1922,6 +1915,9 @@ fi
 #
 #
 %changelog
+* Mon Apr 30 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.6-200
+- Linux v4.16.6
+
 * Fri Apr 27 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.5-200
 - Fix an issue with bluetooth autosupsend on some XPS 13 9360 (rhbz 1514836)
 - Fix prlimit64 with RLIMIT_CPU ignored (rhbz 1568337)
diff --git a/net-Revert-macsec-missing-dev_put-on-error-in-macsec_newlink.patch b/net-Revert-macsec-missing-dev_put-on-error-in-macsec_newlink.patch
deleted file mode 100644
index f3af83782..000000000
--- a/net-Revert-macsec-missing-dev_put-on-error-in-macsec_newlink.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From patchwork Mon Apr 16 10:17:50 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [net] Revert "macsec: missing dev_put() on error in macsec_newlink()"
-X-Patchwork-Submitter: Dan Carpenter <dan.carpenter@oracle.com>
-X-Patchwork-Id: 898556
-X-Patchwork-Delegate: davem@davemloft.net
-Message-Id: <20180416101750.GA19613@mwanda>
-To: Laura Abbott <labbott@redhat.com>, Sabrina Dubroca <sd@queasysnail.net>
-Cc: "David S. Miller" <davem@davemloft.net>,
- Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
- netdev@vger.kernel.org
-Date: Mon, 16 Apr 2018 13:17:50 +0300
-From: Dan Carpenter <dan.carpenter@oracle.com>
-List-Id: <netdev.vger.kernel.org>
-
-This patch is just wrong, sorry.  I was trying to fix a static checker
-warning and misread the code.  The reference taken in macsec_newlink()
-is released in macsec_free_netdev() when the netdevice is destroyed.
-
-This reverts commit 5dcd8400884cc4a043a6d4617e042489e5d566a9.
-
-Reported-by: Laura Abbott <labbott@redhat.com>
-Fixes: 5dcd8400884c ("macsec: missing dev_put() on error in macsec_newlink()")
-Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
-Acked-by: Sabrina Dubroca <sd@queasysnail.net>
----
-I sent this earlier but I messed up the CC list.  I've updated the
-commit message as well.
-
- drivers/net/macsec.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
-index 9cbb0c8a896a..7de88b33d5b9 100644
---- a/drivers/net/macsec.c
-+++ b/drivers/net/macsec.c
-@@ -3277,7 +3277,7 @@ static int macsec_newlink(struct net *net, struct net_device *dev,
- 
- 	err = netdev_upper_dev_link(real_dev, dev, extack);
- 	if (err < 0)
--		goto put_dev;
-+		goto unregister;
- 
- 	/* need to be already registered so that ->init has run and
- 	 * the MAC addr is set
-@@ -3316,8 +3316,7 @@ static int macsec_newlink(struct net *net, struct net_device *dev,
- 	macsec_del_dev(macsec);
- unlink:
- 	netdev_upper_dev_unlink(real_dev, dev);
--put_dev:
--	dev_put(real_dev);
-+unregister:
- 	unregister_netdevice(dev);
- 	return err;
- }
diff --git a/sources b/sources
index 59e27b483..b852a335e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
-SHA512 (patch-4.16.5.xz) = 15c0f85c5f35c2d87a0b63767e18c52a469a81154d915c50b7c7b1c0aed81229e86b3e1cf6e021539c100b29766c47c459adb7d2fcce0da165090206832f62f9
+SHA512 (patch-4.16.6.xz) = 151f3fedfb025f090e0f3d747890366933236b11d1f2bf8794c7d0309f9bb577c01fbfcd6ac073b3c49657543961592c643e896c6a57fe8df6ecde89270d0b36