diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index ba3a7284ee..8145bdac4e 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="bcm2835-driver" -PKG_VERSION="ba7a8fb" +PKG_VERSION="4047fe2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree" diff --git a/packages/linux/package.mk b/packages/linux/package.mk index c7b2832e23..627a105532 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -40,7 +40,7 @@ case "$LINUX" in PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan" ;; *) - PKG_VERSION="4.1.10" + PKG_VERSION="4.1.11" PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz" ;; esac diff --git a/packages/linux/patches/4.1.10/linux-999.11-inet-fix-potential-deadlock-in-reqsk_queue_unlink.patch b/packages/linux/patches/4.1.10/linux-999.11-inet-fix-potential-deadlock-in-reqsk_queue_unlink.patch deleted file mode 100644 index b6c9f34dc9..0000000000 --- a/packages/linux/patches/4.1.10/linux-999.11-inet-fix-potential-deadlock-in-reqsk_queue_unlink.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 05676fe53c9f26fe703c57b14bdd0807e23cc33b Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Thu, 13 Aug 2015 15:44:51 -0700 -Subject: [PATCH 1/2] inet: fix potential deadlock in reqsk_queue_unlink() - -When replacing del_timer() with del_timer_sync(), I introduced -a deadlock condition : - -reqsk_queue_unlink() is called from inet_csk_reqsk_queue_drop() - -inet_csk_reqsk_queue_drop() can be called from many contexts, -one being the timer handler itself (reqsk_timer_handler()). - -In this case, del_timer_sync() loops forever. - -Simple fix is to test if timer is pending. - -Fixes: 2235f2ac75fd ("inet: fix races with reqsk timers") -Signed-off-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - net/ipv4/inet_connection_sock.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c -index b27fc401c6a9..e664706b350c 100644 ---- a/net/ipv4/inet_connection_sock.c -+++ b/net/ipv4/inet_connection_sock.c -@@ -584,7 +584,7 @@ static bool reqsk_queue_unlink(struct request_sock_queue *queue, - } - - spin_unlock(&queue->syn_wait_lock); -- if (del_timer_sync(&req->rsk_timer)) -+ if (timer_pending(&req->rsk_timer) && del_timer_sync(&req->rsk_timer)) - reqsk_put(req); - return found; - } --- -2.4.3 - diff --git a/packages/linux/patches/4.1.10/linux-003-no_dev_console.patch b/packages/linux/patches/4.1.11/linux-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-003-no_dev_console.patch rename to packages/linux/patches/4.1.11/linux-003-no_dev_console.patch diff --git a/packages/linux/patches/4.1.10/linux-051-ouya_controller_support.patch b/packages/linux/patches/4.1.11/linux-051-ouya_controller_support.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-051-ouya_controller_support.patch rename to packages/linux/patches/4.1.11/linux-051-ouya_controller_support.patch diff --git a/packages/linux/patches/4.1.10/linux-052-XBOX_remote_support.patch b/packages/linux/patches/4.1.11/linux-052-XBOX_remote_support.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-052-XBOX_remote_support.patch rename to packages/linux/patches/4.1.11/linux-052-XBOX_remote_support.patch diff --git a/packages/linux/patches/4.1.10/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/4.1.11/linux-053-spinelplus-remote-0.2.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-053-spinelplus-remote-0.2.patch rename to packages/linux/patches/4.1.11/linux-053-spinelplus-remote-0.2.patch diff --git a/packages/linux/patches/4.1.10/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch b/packages/linux/patches/4.1.11/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch rename to packages/linux/patches/4.1.11/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch diff --git a/packages/linux/patches/4.1.10/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/4.1.11/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch rename to packages/linux/patches/4.1.11/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/4.1.10/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/4.1.11/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch rename to packages/linux/patches/4.1.11/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch diff --git a/packages/linux/patches/4.1.10/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/packages/linux/patches/4.1.11/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch rename to packages/linux/patches/4.1.11/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch diff --git a/packages/linux/patches/4.1.10/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch b/packages/linux/patches/4.1.11/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch rename to packages/linux/patches/4.1.11/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch diff --git a/packages/linux/patches/4.1.10/linux-062-imon_pad_ignore_diagonal.patch b/packages/linux/patches/4.1.11/linux-062-imon_pad_ignore_diagonal.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-062-imon_pad_ignore_diagonal.patch rename to packages/linux/patches/4.1.11/linux-062-imon_pad_ignore_diagonal.patch diff --git a/packages/linux/patches/4.1.10/linux-063-xpad-fix_xbox360_wireless.patch b/packages/linux/patches/4.1.11/linux-063-xpad-fix_xbox360_wireless.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-063-xpad-fix_xbox360_wireless.patch rename to packages/linux/patches/4.1.11/linux-063-xpad-fix_xbox360_wireless.patch diff --git a/packages/linux/patches/4.1.10/linux-200-rtl28xxu-fix-control-message-flaws.patch b/packages/linux/patches/4.1.11/linux-200-rtl28xxu-fix-control-message-flaws.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-200-rtl28xxu-fix-control-message-flaws.patch rename to packages/linux/patches/4.1.11/linux-200-rtl28xxu-fix-control-message-flaws.patch diff --git a/packages/linux/patches/4.1.10/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/4.1.11/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/4.1.11/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/4.1.10/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/4.1.11/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/4.1.11/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/4.1.10/linux-221-ngene-octopus.patch b/packages/linux/patches/4.1.11/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-221-ngene-octopus.patch rename to packages/linux/patches/4.1.11/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/4.1.10/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/4.1.11/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/4.1.11/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/4.1.10/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/packages/linux/patches/4.1.11/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch rename to packages/linux/patches/4.1.11/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch diff --git a/packages/linux/patches/4.1.10/linux-224-STK1160-addFramescaling.patch b/packages/linux/patches/4.1.11/linux-224-STK1160-addFramescaling.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-224-STK1160-addFramescaling.patch rename to packages/linux/patches/4.1.11/linux-224-STK1160-addFramescaling.patch diff --git a/packages/linux/patches/4.1.10/linux-227-ds3000-invalid-symbol-rate.patch b/packages/linux/patches/4.1.11/linux-227-ds3000-invalid-symbol-rate.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-227-ds3000-invalid-symbol-rate.patch rename to packages/linux/patches/4.1.11/linux-227-ds3000-invalid-symbol-rate.patch diff --git a/packages/linux/patches/4.1.10/linux-228-fix-tt-s2-4600.patch b/packages/linux/patches/4.1.11/linux-228-fix-tt-s2-4600.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-228-fix-tt-s2-4600.patch rename to packages/linux/patches/4.1.11/linux-228-fix-tt-s2-4600.patch diff --git a/packages/linux/patches/4.1.10/linux-229-hauppauge-hvr-2205-and-2255.patch b/packages/linux/patches/4.1.11/linux-229-hauppauge-hvr-2205-and-2255.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-229-hauppauge-hvr-2205-and-2255.patch rename to packages/linux/patches/4.1.11/linux-229-hauppauge-hvr-2205-and-2255.patch diff --git a/packages/linux/patches/4.1.10/linux-230-elgato-eyetv-sat-v3.patch b/packages/linux/patches/4.1.11/linux-230-elgato-eyetv-sat-v3.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-230-elgato-eyetv-sat-v3.patch rename to packages/linux/patches/4.1.11/linux-230-elgato-eyetv-sat-v3.patch diff --git a/packages/linux/patches/4.1.10/linux-706-Sitecom-N300.patch b/packages/linux/patches/4.1.11/linux-706-Sitecom-N300.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-706-Sitecom-N300.patch rename to packages/linux/patches/4.1.11/linux-706-Sitecom-N300.patch diff --git a/packages/linux/patches/4.1.10/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/4.1.11/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/4.1.11/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/4.1.10/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/4.1.11/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch rename to packages/linux/patches/4.1.11/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch diff --git a/packages/linux/patches/4.1.10/linux-995-CX24120-13Z_frontend.patch b/packages/linux/patches/4.1.11/linux-995-CX24120-13Z_frontend.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-995-CX24120-13Z_frontend.patch rename to packages/linux/patches/4.1.11/linux-995-CX24120-13Z_frontend.patch diff --git a/packages/linux/patches/4.1.10/linux-999-i915-use-legacy-turbo.patch b/packages/linux/patches/4.1.11/linux-999-i915-use-legacy-turbo.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-999-i915-use-legacy-turbo.patch rename to packages/linux/patches/4.1.11/linux-999-i915-use-legacy-turbo.patch diff --git a/packages/linux/patches/4.1.10/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch b/packages/linux/patches/4.1.11/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch rename to packages/linux/patches/4.1.11/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch diff --git a/packages/linux/patches/4.1.10/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch b/packages/linux/patches/4.1.11/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch rename to packages/linux/patches/4.1.11/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch diff --git a/packages/linux/patches/4.1.10/linux-999.10-inet-fix-race-in-reqsk_queue_unlink.patch b/packages/linux/patches/4.1.11/linux-999.10-inet-fix-race-in-reqsk_queue_unlink.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-999.10-inet-fix-race-in-reqsk_queue_unlink.patch rename to packages/linux/patches/4.1.11/linux-999.10-inet-fix-race-in-reqsk_queue_unlink.patch diff --git a/packages/linux/patches/4.1.10/linux-999.20-mt7601u-support.patch b/packages/linux/patches/4.1.11/linux-999.20-mt7601u-support.patch similarity index 100% rename from packages/linux/patches/4.1.10/linux-999.20-mt7601u-support.patch rename to packages/linux/patches/4.1.11/linux-999.20-mt7601u-support.patch diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index f7e75eaa48..192ec1f6f0 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="ba7a8fb" +PKG_VERSION="4047fe2" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree"