diff --git a/packages/linux/package.mk b/packages/linux/package.mk index d6e22102f9..1fd61a39cd 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.3" + PKG_VERSION="4.1.4" 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.3/linux-003-no_dev_console.patch b/packages/linux/patches/4.1.4/linux-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-003-no_dev_console.patch rename to packages/linux/patches/4.1.4/linux-003-no_dev_console.patch diff --git a/packages/linux/patches/4.1.3/linux-051-ouya_controller_support.patch b/packages/linux/patches/4.1.4/linux-051-ouya_controller_support.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-051-ouya_controller_support.patch rename to packages/linux/patches/4.1.4/linux-051-ouya_controller_support.patch diff --git a/packages/linux/patches/4.1.3/linux-052-XBOX_remote_support.patch b/packages/linux/patches/4.1.4/linux-052-XBOX_remote_support.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-052-XBOX_remote_support.patch rename to packages/linux/patches/4.1.4/linux-052-XBOX_remote_support.patch diff --git a/packages/linux/patches/4.1.3/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/4.1.4/linux-053-spinelplus-remote-0.2.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-053-spinelplus-remote-0.2.patch rename to packages/linux/patches/4.1.4/linux-053-spinelplus-remote-0.2.patch diff --git a/packages/linux/patches/4.1.3/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch b/packages/linux/patches/4.1.4/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch rename to packages/linux/patches/4.1.4/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch diff --git a/packages/linux/patches/4.1.3/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/4.1.4/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch rename to packages/linux/patches/4.1.4/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/4.1.3/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/4.1.4/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch rename to packages/linux/patches/4.1.4/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch diff --git a/packages/linux/patches/4.1.3/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/packages/linux/patches/4.1.4/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch rename to packages/linux/patches/4.1.4/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch diff --git a/packages/linux/patches/4.1.3/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch b/packages/linux/patches/4.1.4/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch rename to packages/linux/patches/4.1.4/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch diff --git a/packages/linux/patches/4.1.3/linux-062-imon_pad_ignore_diagonal.patch b/packages/linux/patches/4.1.4/linux-062-imon_pad_ignore_diagonal.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-062-imon_pad_ignore_diagonal.patch rename to packages/linux/patches/4.1.4/linux-062-imon_pad_ignore_diagonal.patch diff --git a/packages/linux/patches/4.1.3/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/4.1.4/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/4.1.4/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/4.1.3/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/4.1.4/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/4.1.4/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/4.1.3/linux-221-ngene-octopus.patch b/packages/linux/patches/4.1.4/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-221-ngene-octopus.patch rename to packages/linux/patches/4.1.4/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/4.1.3/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/4.1.4/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/4.1.4/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/4.1.3/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/packages/linux/patches/4.1.4/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch rename to packages/linux/patches/4.1.4/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch diff --git a/packages/linux/patches/4.1.3/linux-224-STK1160-addFramescaling.patch b/packages/linux/patches/4.1.4/linux-224-STK1160-addFramescaling.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-224-STK1160-addFramescaling.patch rename to packages/linux/patches/4.1.4/linux-224-STK1160-addFramescaling.patch diff --git a/packages/linux/patches/4.1.3/linux-227-ds3000-invalid-symbol-rate.patch b/packages/linux/patches/4.1.4/linux-227-ds3000-invalid-symbol-rate.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-227-ds3000-invalid-symbol-rate.patch rename to packages/linux/patches/4.1.4/linux-227-ds3000-invalid-symbol-rate.patch diff --git a/packages/linux/patches/4.1.3/linux-228-fix-tt-s2-4600.patch b/packages/linux/patches/4.1.4/linux-228-fix-tt-s2-4600.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-228-fix-tt-s2-4600.patch rename to packages/linux/patches/4.1.4/linux-228-fix-tt-s2-4600.patch diff --git a/packages/linux/patches/4.1.3/linux-229-hauppauge-hvr-2205-and-2255.patch b/packages/linux/patches/4.1.4/linux-229-hauppauge-hvr-2205-and-2255.patch similarity index 92% rename from packages/linux/patches/4.1.3/linux-229-hauppauge-hvr-2205-and-2255.patch rename to packages/linux/patches/4.1.4/linux-229-hauppauge-hvr-2205-and-2255.patch index cfbd619b7e..eff856b98f 100644 --- a/packages/linux/patches/4.1.3/linux-229-hauppauge-hvr-2205-and-2255.patch +++ b/packages/linux/patches/4.1.4/linux-229-hauppauge-hvr-2205-and-2255.patch @@ -540,29 +540,6 @@ diff -urN a/drivers/media/pci/saa7164/saa7164-dvb.c b/drivers/media/pci/saa7164/ + return -1; } -diff -urN a/drivers/media/pci/saa7164/saa7164-encoder.c b/drivers/media/pci/saa7164/saa7164-encoder.c ---- a/drivers/media/pci/saa7164/saa7164-encoder.c 2015-06-22 08:05:43.000000000 +0300 -+++ b/drivers/media/pci/saa7164/saa7164-encoder.c 2015-06-24 18:41:23.254376349 +0300 -@@ -721,13 +721,14 @@ - sizeof(cap->card)); - sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); - -- cap->capabilities = -+ cap->device_caps = - V4L2_CAP_VIDEO_CAPTURE | -- V4L2_CAP_READWRITE | -- 0; -+ V4L2_CAP_READWRITE | -+ V4L2_CAP_TUNER; - -- cap->capabilities |= V4L2_CAP_TUNER; -- cap->version = 0; -+ cap->capabilities = cap->device_caps | -+ V4L2_CAP_VBI_CAPTURE | -+ V4L2_CAP_DEVICE_CAPS; - - return 0; - } diff -urN a/drivers/media/pci/saa7164/saa7164.h b/drivers/media/pci/saa7164/saa7164.h --- a/drivers/media/pci/saa7164/saa7164.h 2015-06-22 08:05:43.000000000 +0300 +++ b/drivers/media/pci/saa7164/saa7164.h 2015-06-24 18:41:57.246377117 +0300 @@ -593,29 +570,6 @@ diff -urN a/drivers/media/pci/saa7164/saa7164.h b/drivers/media/pci/saa7164/saa7 struct cmd cmds[SAA_CMD_MAX_MSG_UNITS]; struct mutex lock; -diff -urN a/drivers/media/pci/saa7164/saa7164-vbi.c b/drivers/media/pci/saa7164/saa7164-vbi.c ---- a/drivers/media/pci/saa7164/saa7164-vbi.c 2015-06-22 08:05:43.000000000 +0300 -+++ b/drivers/media/pci/saa7164/saa7164-vbi.c 2015-06-24 18:42:05.582377305 +0300 -@@ -660,13 +660,14 @@ - sizeof(cap->card)); - sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); - -- cap->capabilities = -+ cap->device_caps = - V4L2_CAP_VBI_CAPTURE | -- V4L2_CAP_READWRITE | -- 0; -+ V4L2_CAP_READWRITE | -+ V4L2_CAP_TUNER; - -- cap->capabilities |= V4L2_CAP_TUNER; -- cap->version = 0; -+ cap->capabilities = cap->device_caps | -+ V4L2_CAP_VIDEO_CAPTURE | -+ V4L2_CAP_DEVICE_CAPS; - - return 0; - } diff -urN a/drivers/media/pci/saa7164/saa7164-i2c.c b/drivers/media/pci/saa7164/saa7164-i2c.c --- a/drivers/media/pci/saa7164/saa7164-i2c.c +++ b/drivers/media/pci/saa7164/saa7164-i2c.c diff --git a/packages/linux/patches/4.1.3/linux-706-Sitecom-N300.patch b/packages/linux/patches/4.1.4/linux-706-Sitecom-N300.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-706-Sitecom-N300.patch rename to packages/linux/patches/4.1.4/linux-706-Sitecom-N300.patch diff --git a/packages/linux/patches/4.1.3/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/4.1.4/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/4.1.4/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/4.1.3/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/4.1.4/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch rename to packages/linux/patches/4.1.4/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch diff --git a/packages/linux/patches/4.1.3/linux-995-CX24120-13Z_frontend.patch b/packages/linux/patches/4.1.4/linux-995-CX24120-13Z_frontend.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-995-CX24120-13Z_frontend.patch rename to packages/linux/patches/4.1.4/linux-995-CX24120-13Z_frontend.patch diff --git a/packages/linux/patches/4.1.3/linux-999-i915-use-legacy-turbo.patch b/packages/linux/patches/4.1.4/linux-999-i915-use-legacy-turbo.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-999-i915-use-legacy-turbo.patch rename to packages/linux/patches/4.1.4/linux-999-i915-use-legacy-turbo.patch diff --git a/packages/linux/patches/4.1.3/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch b/packages/linux/patches/4.1.4/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch rename to packages/linux/patches/4.1.4/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch diff --git a/packages/linux/patches/4.1.3/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch b/packages/linux/patches/4.1.4/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch similarity index 100% rename from packages/linux/patches/4.1.3/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch rename to packages/linux/patches/4.1.4/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch