diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 1088ca6c8b..617a13da64 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.12" + PKG_VERSION="4.1.13" 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.12/linux-200-rtl28xxu-fix-control-message-flaws.patch b/packages/linux/patches/4.1.12/linux-200-rtl28xxu-fix-control-message-flaws.patch deleted file mode 100644 index c766b67719..0000000000 --- a/packages/linux/patches/4.1.12/linux-200-rtl28xxu-fix-control-message-flaws.patch +++ /dev/null @@ -1,54 +0,0 @@ -# from upstream http://git.linuxtv.org/cgit.cgi/anttip/media_tree.git/commit/?h=rtl2832u_test2&id=3fde4395e9c58ab45470529f29864446230c5368 - -diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c -index c3cac4c..197a4f2 100644 ---- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c -+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c -@@ -34,6 +34,14 @@ static int rtl28xxu_ctrl_msg(struct dvb_usb_device *d, struct rtl28xxu_req *req) - unsigned int pipe; - u8 requesttype; - -+ mutex_lock(&d->usb_mutex); -+ -+ if (req->size > sizeof(dev->buf)) { -+ dev_err(&d->intf->dev, "too large message %u\n", req->size); -+ ret = -EINVAL; -+ goto err_mutex_unlock; -+ } -+ - if (req->index & CMD_WR_FLAG) { - /* write */ - memcpy(dev->buf, req->data, req->size); -@@ -50,14 +58,17 @@ static int rtl28xxu_ctrl_msg(struct dvb_usb_device *d, struct rtl28xxu_req *req) - dvb_usb_dbg_usb_control_msg(d->udev, 0, requesttype, req->value, - req->index, dev->buf, req->size); - if (ret < 0) -- goto err; -+ goto err_mutex_unlock; - - /* read request, copy returned data to return buf */ - if (requesttype == (USB_TYPE_VENDOR | USB_DIR_IN)) - memcpy(req->data, dev->buf, req->size); - -+ mutex_unlock(&d->usb_mutex); -+ - return 0; --err: -+err_mutex_unlock: -+ mutex_unlock(&d->usb_mutex); - dev_dbg(&d->intf->dev, "failed=%d\n", ret); - return ret; - } -diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h -index 9f6115a..1380629 100644 ---- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h -+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h -@@ -71,7 +71,7 @@ - - - struct rtl28xxu_dev { -- u8 buf[28]; -+ u8 buf[128]; - u8 chip_id; - u8 tuner; - char *tuner_name; diff --git a/packages/linux/patches/4.1.12/linux-003-no_dev_console.patch b/packages/linux/patches/4.1.13/linux-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-003-no_dev_console.patch rename to packages/linux/patches/4.1.13/linux-003-no_dev_console.patch diff --git a/packages/linux/patches/4.1.12/linux-051-ouya_controller_support.patch b/packages/linux/patches/4.1.13/linux-051-ouya_controller_support.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-051-ouya_controller_support.patch rename to packages/linux/patches/4.1.13/linux-051-ouya_controller_support.patch diff --git a/packages/linux/patches/4.1.12/linux-052-XBOX_remote_support.patch b/packages/linux/patches/4.1.13/linux-052-XBOX_remote_support.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-052-XBOX_remote_support.patch rename to packages/linux/patches/4.1.13/linux-052-XBOX_remote_support.patch diff --git a/packages/linux/patches/4.1.12/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/4.1.13/linux-053-spinelplus-remote-0.2.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-053-spinelplus-remote-0.2.patch rename to packages/linux/patches/4.1.13/linux-053-spinelplus-remote-0.2.patch diff --git a/packages/linux/patches/4.1.12/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch b/packages/linux/patches/4.1.13/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch rename to packages/linux/patches/4.1.13/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch diff --git a/packages/linux/patches/4.1.12/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/4.1.13/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch rename to packages/linux/patches/4.1.13/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/4.1.12/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/4.1.13/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch rename to packages/linux/patches/4.1.13/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch diff --git a/packages/linux/patches/4.1.12/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/packages/linux/patches/4.1.13/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch rename to packages/linux/patches/4.1.13/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch diff --git a/packages/linux/patches/4.1.12/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch b/packages/linux/patches/4.1.13/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch rename to packages/linux/patches/4.1.13/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch diff --git a/packages/linux/patches/4.1.12/linux-062-imon_pad_ignore_diagonal.patch b/packages/linux/patches/4.1.13/linux-062-imon_pad_ignore_diagonal.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-062-imon_pad_ignore_diagonal.patch rename to packages/linux/patches/4.1.13/linux-062-imon_pad_ignore_diagonal.patch diff --git a/packages/linux/patches/4.1.12/linux-063-xpad-fix_xbox360_wireless.patch b/packages/linux/patches/4.1.13/linux-063-xpad-fix_xbox360_wireless.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-063-xpad-fix_xbox360_wireless.patch rename to packages/linux/patches/4.1.13/linux-063-xpad-fix_xbox360_wireless.patch diff --git a/packages/linux/patches/4.1.12/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/4.1.13/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/4.1.13/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/4.1.12/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/4.1.13/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/4.1.13/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/4.1.12/linux-221-ngene-octopus.patch b/packages/linux/patches/4.1.13/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-221-ngene-octopus.patch rename to packages/linux/patches/4.1.13/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/4.1.12/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/4.1.13/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/4.1.13/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/4.1.12/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/packages/linux/patches/4.1.13/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch rename to packages/linux/patches/4.1.13/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch diff --git a/packages/linux/patches/4.1.12/linux-224-STK1160-addFramescaling.patch b/packages/linux/patches/4.1.13/linux-224-STK1160-addFramescaling.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-224-STK1160-addFramescaling.patch rename to packages/linux/patches/4.1.13/linux-224-STK1160-addFramescaling.patch diff --git a/packages/linux/patches/4.1.12/linux-227-ds3000-invalid-symbol-rate.patch b/packages/linux/patches/4.1.13/linux-227-ds3000-invalid-symbol-rate.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-227-ds3000-invalid-symbol-rate.patch rename to packages/linux/patches/4.1.13/linux-227-ds3000-invalid-symbol-rate.patch diff --git a/packages/linux/patches/4.1.12/linux-228-fix-tt-s2-4600.patch b/packages/linux/patches/4.1.13/linux-228-fix-tt-s2-4600.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-228-fix-tt-s2-4600.patch rename to packages/linux/patches/4.1.13/linux-228-fix-tt-s2-4600.patch diff --git a/packages/linux/patches/4.1.12/linux-229-hauppauge-hvr-2205-and-2255.patch b/packages/linux/patches/4.1.13/linux-229-hauppauge-hvr-2205-and-2255.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-229-hauppauge-hvr-2205-and-2255.patch rename to packages/linux/patches/4.1.13/linux-229-hauppauge-hvr-2205-and-2255.patch diff --git a/packages/linux/patches/4.1.12/linux-230-elgato-eyetv-sat-v3.patch b/packages/linux/patches/4.1.13/linux-230-elgato-eyetv-sat-v3.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-230-elgato-eyetv-sat-v3.patch rename to packages/linux/patches/4.1.13/linux-230-elgato-eyetv-sat-v3.patch diff --git a/packages/linux/patches/4.1.12/linux-706-Sitecom-N300.patch b/packages/linux/patches/4.1.13/linux-706-Sitecom-N300.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-706-Sitecom-N300.patch rename to packages/linux/patches/4.1.13/linux-706-Sitecom-N300.patch diff --git a/packages/linux/patches/4.1.12/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/4.1.13/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/4.1.13/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/4.1.12/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/4.1.13/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch rename to packages/linux/patches/4.1.13/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch diff --git a/packages/linux/patches/4.1.12/linux-995-CX24120-13Z_frontend.patch b/packages/linux/patches/4.1.13/linux-995-CX24120-13Z_frontend.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-995-CX24120-13Z_frontend.patch rename to packages/linux/patches/4.1.13/linux-995-CX24120-13Z_frontend.patch diff --git a/packages/linux/patches/4.1.12/linux-999-i915-use-legacy-turbo.patch b/packages/linux/patches/4.1.13/linux-999-i915-use-legacy-turbo.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-999-i915-use-legacy-turbo.patch rename to packages/linux/patches/4.1.13/linux-999-i915-use-legacy-turbo.patch diff --git a/packages/linux/patches/4.1.12/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch b/packages/linux/patches/4.1.13/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch rename to packages/linux/patches/4.1.13/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch diff --git a/packages/linux/patches/4.1.12/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch b/packages/linux/patches/4.1.13/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch rename to packages/linux/patches/4.1.13/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch diff --git a/packages/linux/patches/4.1.12/linux-999.20-mt7601u-support.patch b/packages/linux/patches/4.1.13/linux-999.20-mt7601u-support.patch similarity index 100% rename from packages/linux/patches/4.1.12/linux-999.20-mt7601u-support.patch rename to packages/linux/patches/4.1.13/linux-999.20-mt7601u-support.patch