From 5540b06958ddcd0af9f92bdb2509b7929c494077 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 27 Jan 2015 21:17:12 +0100 Subject: [PATCH] linux: update to linux-3.18.4 Signed-off-by: Stephan Raue --- packages/linux/package.mk | 2 +- .../linux-011-intel-force-cs-stall.patch | 37 -------------- .../linux-012-intel-fix-ivb-stall.patch | 49 ------------------- .../linux-003-no_dev_console.patch | 0 .../linux-052-XBOX_remote_support.patch | 0 .../linux-053-spinelplus-remote-0.2.patch | 0 ...1056c5564eec8a1b169c6e84ff3.6.114c13.patch | 0 ...-add_Formosa_eHome_Infrared_Receiver.patch | 0 ...-add_Adaptec_eHome_Infrared_Receiver.patch | 0 ...tomer-code-restriction-in-rc6-decode.patch | 0 ..._Manufacturing_Inc_Infrared_Receiver.patch | 0 ..._sony-add_autorepeat_for_PS3_remotes.patch | 0 .../linux-058.06-hid_sony-add_SMK_link.patch | 0 .../linux-060-add_AUGUST_DVB-T205.patch | 0 .../linux-062-imon_pad_ignore_diagonal.patch | 0 ...x-203-stb0899_enable_low_symbol_rate.patch | 0 .../{3.18.3 => 3.18.4}/linux-210-dvbsky.patch | 0 .../linux-211-dvbsky-s950v3-s952v3.patch | 0 ...linux-212-mantis_stb0899_faster_lock.patch | 0 .../linux-221-ngene-octopus.patch | 0 .../linux-222-stb0899_signal_quality.patch | 0 ...-video-artifacts-with-tt-3600-s2-usb.patch | 0 .../linux-226-geniatech-t230-tuner.patch | 0 .../linux-703-macmini2012-ethernet.patch | 0 ...Support-for-Buffalo-WLI-UC-G300HP-V1.patch | 0 .../linux-706-Sitecom-N300.patch | 0 .../linux-900-hide_tsc_error.patch | 0 ...x-950-saa716x_PCIe_interface_chipset.patch | 0 ...utputting-HDMI-audio-before-prepare-.patch | 0 .../linux-995-CX24120-13Z_frontend.patch | 0 ...able-async-suspend-resume-by-default.patch | 0 ...revert-xhci-Set-scatter-gather-limit.patch | 0 .../linux-999.06-radeon-upstream-fixes.patch | 0 .../todo/linux-010-intel-fix-gpu-hang.patch | 0 .../linux-051-ouya_controller_support.patch | 0 .../linux-059-remove_some_xpad_pids-0.2.patch | 0 .../todo/linux-061-valve-xpad-rework.patch | 0 .../linux-701-linksys_aes2500_brcmfmac.patch | 0 38 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 packages/linux/patches/3.18.3/linux-011-intel-force-cs-stall.patch delete mode 100644 packages/linux/patches/3.18.3/linux-012-intel-fix-ivb-stall.patch rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-003-no_dev_console.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-052-XBOX_remote_support.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-053-spinelplus-remote-0.2.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-055-add_Formosa_eHome_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-058.06-hid_sony-add_SMK_link.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-060-add_AUGUST_DVB-T205.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-062-imon_pad_ignore_diagonal.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-203-stb0899_enable_low_symbol_rate.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-210-dvbsky.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-211-dvbsky-s950v3-s952v3.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-212-mantis_stb0899_faster_lock.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-221-ngene-octopus.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-222-stb0899_signal_quality.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-226-geniatech-t230-tuner.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-703-macmini2012-ethernet.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-706-Sitecom-N300.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-900-hide_tsc_error.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-950-saa716x_PCIe_interface_chipset.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-995-CX24120-13Z_frontend.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/linux-999.06-radeon-upstream-fixes.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/todo/linux-010-intel-fix-gpu-hang.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/todo/linux-051-ouya_controller_support.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/todo/linux-059-remove_some_xpad_pids-0.2.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/todo/linux-061-valve-xpad-rework.patch (100%) rename packages/linux/patches/{3.18.3 => 3.18.4}/todo/linux-701-linksys_aes2500_brcmfmac.patch (100%) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 42802bcc01..78332f6286 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -27,7 +27,7 @@ case "$LINUX" in PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" ;; *) - PKG_VERSION="3.18.3" + PKG_VERSION="3.18.4" PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" ;; esac diff --git a/packages/linux/patches/3.18.3/linux-011-intel-force-cs-stall.patch b/packages/linux/patches/3.18.3/linux-011-intel-force-cs-stall.patch deleted file mode 100644 index 81649a6626..0000000000 --- a/packages/linux/patches/3.18.3/linux-011-intel-force-cs-stall.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 78e2b1bdd84264d6a9d84759da26547f887552cd Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Tue, 16 Dec 2014 08:44:32 +0000 -Subject: [PATCH] drm/i915: Force the CS stall for invalidate flushes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In order to act as a full command barrier by itself, we need to tell the -pipecontrol to actually stall the command streamer while the flush runs. -We require the full command barrier before operations like -MI_SET_CONTEXT, which currently rely on a prior invalidate flush. - -References: https://bugs.freedesktop.org/show_bug.cgi?id=83677 -Cc: Simon Farnsworth -Cc: Daniel Vetter -Cc: Ville Syrjälä -Signed-off-by: Chris Wilson -Cc: stable@vger.kernel.org -Signed-off-by: Jani Nikula ---- - drivers/gpu/drm/i915/intel_ringbuffer.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c -index b02cf69..ae17e77 100644 ---- a/drivers/gpu/drm/i915/intel_ringbuffer.c -+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c -@@ -369,6 +369,8 @@ gen7_render_ring_flush(struct intel_engine_cs *ring, - flags |= PIPE_CONTROL_QW_WRITE; - flags |= PIPE_CONTROL_GLOBAL_GTT_IVB; - -+ flags |= PIPE_CONTROL_STALL_AT_SCOREBOARD; -+ - /* Workaround: we must issue a pipe_control with CS-stall bit - * set before a pipe_control command that has the state cache - * invalidate bit set. */ diff --git a/packages/linux/patches/3.18.3/linux-012-intel-fix-ivb-stall.patch b/packages/linux/patches/3.18.3/linux-012-intel-fix-ivb-stall.patch deleted file mode 100644 index a3cbc90c78..0000000000 --- a/packages/linux/patches/3.18.3/linux-012-intel-fix-ivb-stall.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 32431fd81d65259d490e53e3cfc7e1a2ad781fe3 Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Tue, 16 Dec 2014 08:44:31 +0000 -Subject: [PATCH] drm/i915: Invalidate media caches on gen7 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In the gen7 pipe control there is an extra bit to flush the media -caches, so let's set it during cache invalidation flushes. - -v2: Rename to MEDIA_STATE_CLEAR to be more inline with spec. - -Cc: Simon Farnsworth -Cc: Ville Syrjälä -Cc: Daniel Vetter -Signed-off-by: Chris Wilson -Reviewed-by: Daniel Vetter -Cc: stable@vger.kernel.org -Signed-off-by: Jani Nikula ---- - drivers/gpu/drm/i915/i915_reg.h | 1 + - drivers/gpu/drm/i915/intel_ringbuffer.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h -index c01e5f3..d9780e2 100644 ---- a/drivers/gpu/drm/i915/i915_reg.h -+++ b/drivers/gpu/drm/i915/i915_reg.h -@@ -370,6 +370,7 @@ - #define PIPE_CONTROL_STORE_DATA_INDEX (1<<21) - #define PIPE_CONTROL_CS_STALL (1<<20) - #define PIPE_CONTROL_TLB_INVALIDATE (1<<18) -+#define PIPE_CONTROL_MEDIA_STATE_CLEAR (1<<16) - #define PIPE_CONTROL_QW_WRITE (1<<14) - #define PIPE_CONTROL_POST_SYNC_OP_MASK (3<<14) - #define PIPE_CONTROL_DEPTH_STALL (1<<13) -diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c -index 0a80e41..b02cf69 100644 ---- a/drivers/gpu/drm/i915/intel_ringbuffer.c -+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c -@@ -362,6 +362,7 @@ gen7_render_ring_flush(struct intel_engine_cs *ring, - flags |= PIPE_CONTROL_VF_CACHE_INVALIDATE; - flags |= PIPE_CONTROL_CONST_CACHE_INVALIDATE; - flags |= PIPE_CONTROL_STATE_CACHE_INVALIDATE; -+ flags |= PIPE_CONTROL_MEDIA_STATE_CLEAR; - /* - * TLB invalidate requires a post-sync write. - */ diff --git a/packages/linux/patches/3.18.3/linux-003-no_dev_console.patch b/packages/linux/patches/3.18.4/linux-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-003-no_dev_console.patch rename to packages/linux/patches/3.18.4/linux-003-no_dev_console.patch diff --git a/packages/linux/patches/3.18.3/linux-052-XBOX_remote_support.patch b/packages/linux/patches/3.18.4/linux-052-XBOX_remote_support.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-052-XBOX_remote_support.patch rename to packages/linux/patches/3.18.4/linux-052-XBOX_remote_support.patch diff --git a/packages/linux/patches/3.18.3/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/3.18.4/linux-053-spinelplus-remote-0.2.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-053-spinelplus-remote-0.2.patch rename to packages/linux/patches/3.18.4/linux-053-spinelplus-remote-0.2.patch diff --git a/packages/linux/patches/3.18.3/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch b/packages/linux/patches/3.18.4/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch rename to packages/linux/patches/3.18.4/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch diff --git a/packages/linux/patches/3.18.3/linux-055-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.18.4/linux-055-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-055-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.18.4/linux-055-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.18.3/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.18.4/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.18.4/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.18.3/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/3.18.4/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch rename to packages/linux/patches/3.18.4/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch diff --git a/packages/linux/patches/3.18.3/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/packages/linux/patches/3.18.4/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch rename to packages/linux/patches/3.18.4/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.18.3/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch b/packages/linux/patches/3.18.4/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch rename to packages/linux/patches/3.18.4/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch diff --git a/packages/linux/patches/3.18.3/linux-058.06-hid_sony-add_SMK_link.patch b/packages/linux/patches/3.18.4/linux-058.06-hid_sony-add_SMK_link.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-058.06-hid_sony-add_SMK_link.patch rename to packages/linux/patches/3.18.4/linux-058.06-hid_sony-add_SMK_link.patch diff --git a/packages/linux/patches/3.18.3/linux-060-add_AUGUST_DVB-T205.patch b/packages/linux/patches/3.18.4/linux-060-add_AUGUST_DVB-T205.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-060-add_AUGUST_DVB-T205.patch rename to packages/linux/patches/3.18.4/linux-060-add_AUGUST_DVB-T205.patch diff --git a/packages/linux/patches/3.18.3/linux-062-imon_pad_ignore_diagonal.patch b/packages/linux/patches/3.18.4/linux-062-imon_pad_ignore_diagonal.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-062-imon_pad_ignore_diagonal.patch rename to packages/linux/patches/3.18.4/linux-062-imon_pad_ignore_diagonal.patch diff --git a/packages/linux/patches/3.18.3/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.18.4/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/3.18.4/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/3.18.3/linux-210-dvbsky.patch b/packages/linux/patches/3.18.4/linux-210-dvbsky.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-210-dvbsky.patch rename to packages/linux/patches/3.18.4/linux-210-dvbsky.patch diff --git a/packages/linux/patches/3.18.3/linux-211-dvbsky-s950v3-s952v3.patch b/packages/linux/patches/3.18.4/linux-211-dvbsky-s950v3-s952v3.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-211-dvbsky-s950v3-s952v3.patch rename to packages/linux/patches/3.18.4/linux-211-dvbsky-s950v3-s952v3.patch diff --git a/packages/linux/patches/3.18.3/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.18.4/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/3.18.4/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/3.18.3/linux-221-ngene-octopus.patch b/packages/linux/patches/3.18.4/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-221-ngene-octopus.patch rename to packages/linux/patches/3.18.4/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/3.18.3/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/3.18.4/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/3.18.4/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/3.18.3/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/packages/linux/patches/3.18.4/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch rename to packages/linux/patches/3.18.4/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch diff --git a/packages/linux/patches/3.18.3/linux-226-geniatech-t230-tuner.patch b/packages/linux/patches/3.18.4/linux-226-geniatech-t230-tuner.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-226-geniatech-t230-tuner.patch rename to packages/linux/patches/3.18.4/linux-226-geniatech-t230-tuner.patch diff --git a/packages/linux/patches/3.18.3/linux-703-macmini2012-ethernet.patch b/packages/linux/patches/3.18.4/linux-703-macmini2012-ethernet.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-703-macmini2012-ethernet.patch rename to packages/linux/patches/3.18.4/linux-703-macmini2012-ethernet.patch diff --git a/packages/linux/patches/3.18.3/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch b/packages/linux/patches/3.18.4/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch rename to packages/linux/patches/3.18.4/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch diff --git a/packages/linux/patches/3.18.3/linux-706-Sitecom-N300.patch b/packages/linux/patches/3.18.4/linux-706-Sitecom-N300.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-706-Sitecom-N300.patch rename to packages/linux/patches/3.18.4/linux-706-Sitecom-N300.patch diff --git a/packages/linux/patches/3.18.3/linux-900-hide_tsc_error.patch b/packages/linux/patches/3.18.4/linux-900-hide_tsc_error.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-900-hide_tsc_error.patch rename to packages/linux/patches/3.18.4/linux-900-hide_tsc_error.patch diff --git a/packages/linux/patches/3.18.3/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/3.18.4/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/3.18.4/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/3.18.3/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/3.18.4/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch rename to packages/linux/patches/3.18.4/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch diff --git a/packages/linux/patches/3.18.3/linux-995-CX24120-13Z_frontend.patch b/packages/linux/patches/3.18.4/linux-995-CX24120-13Z_frontend.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-995-CX24120-13Z_frontend.patch rename to packages/linux/patches/3.18.4/linux-995-CX24120-13Z_frontend.patch diff --git a/packages/linux/patches/3.18.3/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch b/packages/linux/patches/3.18.4/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch rename to packages/linux/patches/3.18.4/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch diff --git a/packages/linux/patches/3.18.3/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch b/packages/linux/patches/3.18.4/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch rename to packages/linux/patches/3.18.4/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch diff --git a/packages/linux/patches/3.18.3/linux-999.06-radeon-upstream-fixes.patch b/packages/linux/patches/3.18.4/linux-999.06-radeon-upstream-fixes.patch similarity index 100% rename from packages/linux/patches/3.18.3/linux-999.06-radeon-upstream-fixes.patch rename to packages/linux/patches/3.18.4/linux-999.06-radeon-upstream-fixes.patch diff --git a/packages/linux/patches/3.18.3/todo/linux-010-intel-fix-gpu-hang.patch b/packages/linux/patches/3.18.4/todo/linux-010-intel-fix-gpu-hang.patch similarity index 100% rename from packages/linux/patches/3.18.3/todo/linux-010-intel-fix-gpu-hang.patch rename to packages/linux/patches/3.18.4/todo/linux-010-intel-fix-gpu-hang.patch diff --git a/packages/linux/patches/3.18.3/todo/linux-051-ouya_controller_support.patch b/packages/linux/patches/3.18.4/todo/linux-051-ouya_controller_support.patch similarity index 100% rename from packages/linux/patches/3.18.3/todo/linux-051-ouya_controller_support.patch rename to packages/linux/patches/3.18.4/todo/linux-051-ouya_controller_support.patch diff --git a/packages/linux/patches/3.18.3/todo/linux-059-remove_some_xpad_pids-0.2.patch b/packages/linux/patches/3.18.4/todo/linux-059-remove_some_xpad_pids-0.2.patch similarity index 100% rename from packages/linux/patches/3.18.3/todo/linux-059-remove_some_xpad_pids-0.2.patch rename to packages/linux/patches/3.18.4/todo/linux-059-remove_some_xpad_pids-0.2.patch diff --git a/packages/linux/patches/3.18.3/todo/linux-061-valve-xpad-rework.patch b/packages/linux/patches/3.18.4/todo/linux-061-valve-xpad-rework.patch similarity index 100% rename from packages/linux/patches/3.18.3/todo/linux-061-valve-xpad-rework.patch rename to packages/linux/patches/3.18.4/todo/linux-061-valve-xpad-rework.patch diff --git a/packages/linux/patches/3.18.3/todo/linux-701-linksys_aes2500_brcmfmac.patch b/packages/linux/patches/3.18.4/todo/linux-701-linksys_aes2500_brcmfmac.patch similarity index 100% rename from packages/linux/patches/3.18.3/todo/linux-701-linksys_aes2500_brcmfmac.patch rename to packages/linux/patches/3.18.4/todo/linux-701-linksys_aes2500_brcmfmac.patch