diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-09-14 21:10:36 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-09-14 21:10:36 +0200 |
| commit | 4614aefdbb752b27851e8dfee4499e3523d86d47 (patch) | |
| tree | 167da15ca19ed1414b32156c68a28b7c2ea457b0 | |
| parent | 760265ea29971e8cad3b17b1700db011977e665c (diff) | |
| parent | 0ea486fcad7eefd8a87b2b0810216959293bf62b (diff) | |
| download | kernel-4614aefdbb752b27851e8dfee4499e3523d86d47.tar.gz kernel-4614aefdbb752b27851e8dfee4499e3523d86d47.tar.xz kernel-4614aefdbb752b27851e8dfee4499e3523d86d47.zip | |
Merge remote-tracking branch 'origin/f26' into f26-user-thl-vanilla-fedora
| -rw-r--r-- | kernel.spec | 11 | ||||
| -rw-r--r-- | rt2800-fix-TX_PIN_CFG-setting-for-non-MT7620-chips.patch | 41 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 5 insertions, 49 deletions
diff --git a/kernel.spec b/kernel.spec index 830bd5b60..8f69b1c09 100644 --- a/kernel.spec +++ b/kernel.spec @@ -44,7 +44,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 301 +%global baserelease 300 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -689,9 +689,6 @@ Patch706: Fix-for-module-sig-verification.patch # rhbz 1485086 Patch710: pci-mark-amd-stoney-gpu-ats-as-broken.patch -# rhbz 1480829 -Patch711: rt2800-fix-TX_PIN_CFG-setting-for-non-MT7620-chips.patch - # CVE-2017-7558 rhbz 1480266 1484810 Patch712: net-sctp-Avoid-out-of-bounds-reads-from-address-storage.patch @@ -722,9 +719,6 @@ Patch720: kvm-nVMX-Don-t-allow-L2-to-access-the-hardware-CR8.patch # CVE-2017-12153 rhbz 1491046 1491057 Patch721: nl80211-check-for-the-required-netlink-attributes-presence.patch -# CVE-2017-1000251 rhbz 1489716 1490906 -Patch722: bluetooth-properly-check-l2cap-config-option-output-buffer-length.patch - # END OF PATCH DEFINITIONS %endif @@ -2302,6 +2296,9 @@ fi # # %changelog +* Thu Sep 14 2017 Justin M. Forbes <jforbes@redhat.com> - 4.12.13-300 +- Linux v4.12.13 + * Wed Sep 13 2017 Justin M. Forbes <jforbes@fedoraproject.org> - Fix CVE-2017-12154 (rhbz 1491224 1491231) - Fix CVE-2017-12153 (rhbz 1491046 1491057) diff --git a/rt2800-fix-TX_PIN_CFG-setting-for-non-MT7620-chips.patch b/rt2800-fix-TX_PIN_CFG-setting-for-non-MT7620-chips.patch deleted file mode 100644 index 6c3662103..000000000 --- a/rt2800-fix-TX_PIN_CFG-setting-for-non-MT7620-chips.patch +++ /dev/null @@ -1,41 +0,0 @@ -From patchwork Fri Aug 25 11:38:29 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: rt2800: fix TX_PIN_CFG setting for non MT7620 chips -From: Stanislaw Gruszka <sgruszka@redhat.com> -X-Patchwork-Id: 9921831 -Message-Id: <20170825113828.GA3959@redhat.com> -To: linux-wireless@vger.kernel.org -Cc: Daniel Golle <daniel@makrotopia.org> -Date: Fri, 25 Aug 2017 13:38:29 +0200 - -Since commit 41977e86c984 ("rt2x00: add support for MT7620") we do not -initialize TX_PIN_CFG setting. This cause breakage at least on some -RT3573 devices. To fix the problem patch restores previous behaviour -for non MT7620 chips. - -Fixes: 41977e86c984 ("rt2x00: add support for MT7620") -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1480829 -Reported-and-tested-by: Jussi Eloranta <jussi.eloranta@csun.edu> -Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> ---- - drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -index d11c7b2..5672aec 100644 ---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -3699,7 +3699,10 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, - if (rt2x00_rt(rt2x00dev, RT3572)) - rt2800_rfcsr_write(rt2x00dev, 8, 0); - -- rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin); -+ if (rt2x00_rt(rt2x00dev, RT6352)) -+ rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin); -+ else -+ tx_pin = 0; - - switch (rt2x00dev->default_ant.tx_chain_num) { - case 3: @@ -1,3 +1,3 @@ SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 -SHA512 (patch-4.12.12.xz) = 5c61d2f761385f24a64f218011ac4e0d620666aa19fa0b92eb3169f9a059d1d9a06cd6dd56bd4dff9d2d331c82b5f76b58349bdbf48e4e01e0c56932aaf5a7a7 +SHA512 (patch-4.12.13.xz) = c7991705a0f76a09c22777159c93c0c4c0c60c5663432da41ebefdd93ed220abec5584a02c39f12ef46148b9cb23aa50723b3159ba3467effffcf3cf1bf4f6cd |