diff --git a/kernel/kernel/files/configs/kernel-x86_64-config b/kernel/kernel/files/configs/kernel-x86_64-config index 460a8991..2757db28 100644 --- a/kernel/kernel/files/configs/kernel-x86_64-config +++ b/kernel/kernel/files/configs/kernel-x86_64-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.1.3 Kernel Configuration +# Linux/x86_64 4.1.5 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/kernel/files/patches/linux/patch-4.1.5.xz b/kernel/kernel/files/patches/linux/patch-4.1.5.xz new file mode 100644 index 00000000..25a374ff Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-4.1.5.xz differ diff --git a/kernel/kernel/files/patches/mageia/media-Fix-regression-in-some-more-dib0700-based-devi.patch b/kernel/kernel/files/patches/mageia/media-Fix-regression-in-some-more-dib0700-based-devi.patch deleted file mode 100644 index 590b2258..00000000 --- a/kernel/kernel/files/patches/mageia/media-Fix-regression-in-some-more-dib0700-based-devi.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Thomas Reitmayr -Date: Fri, 1 May 2015 20:18:04 -0300 -Subject: [PATCH] media: Fix regression in some more dib0700 based devices - -Fix an oops during device initialization by correctly setting size_of_priv -instead of leaving it 0. -The regression was introduced by 8abe4a0a3f6d4217b16a ("[media] dib7000: -export just one symbol") and only fixed for one type of dib0700 based -devices in 9e334c75642b6e5bfb95 ("[media] Fix regression in some dib0700 -based devices"). - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=92301 - -Fixes: 8abe4a0a3f6d4217b16a ("[media] dib7000: export just one symbol") - -Cc: stable@vger.kernel.org # for version 3.17+ -Signed-off-by: Thomas Reitmayr -Signed-off-by: Mauro Carvalho Chehab ---- - drivers/media/usb/dvb-usb/dib0700_devices.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c -index d7d55a20e959..c170523226aa 100644 ---- a/drivers/media/usb/dvb-usb/dib0700_devices.c -+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c -@@ -3944,6 +3944,8 @@ struct dvb_usb_device_properties dib0700_devices[] = { - - DIB0700_DEFAULT_STREAMING_CONFIG(0x02), - }}, -+ .size_of_priv = sizeof(struct -+ dib0700_adapter_state), - }, { - .num_frontends = 1, - .fe = {{ -@@ -3956,6 +3958,8 @@ struct dvb_usb_device_properties dib0700_devices[] = { - - DIB0700_DEFAULT_STREAMING_CONFIG(0x03), - }}, -+ .size_of_priv = sizeof(struct -+ dib0700_adapter_state), - } - }, - -@@ -4009,6 +4013,8 @@ struct dvb_usb_device_properties dib0700_devices[] = { - - DIB0700_DEFAULT_STREAMING_CONFIG(0x02), - }}, -+ .size_of_priv = sizeof(struct -+ dib0700_adapter_state), - }, - }, - diff --git a/kernel/kernel/files/patches/mageia/series b/kernel/kernel/files/patches/mageia/series index 7fec8c3c..21fc891b 100644 --- a/kernel/kernel/files/patches/mageia/series +++ b/kernel/kernel/files/patches/mageia/series @@ -183,8 +183,6 @@ input-i8042-quirks-for-Fujitsu-Lifebook-A544-and-Lif.patch ### Media ### -media-Fix-regression-in-some-more-dib0700-based-devi.patch - ### ### Misc ### diff --git a/kernel/kernel/pspec.xml b/kernel/kernel/pspec.xml index 9e8b5f38..1d723976 100644 --- a/kernel/kernel/pspec.xml +++ b/kernel/kernel/pspec.xml @@ -28,8 +28,8 @@ i - patches/linux/patch-4.1.3.xz - + patches/linux/patch-4.1.5.xz + patches/mageia/x86-pci-toshiba-equium-a60-assign-busses.patch patches/mageia/x86-boot-video-80x25-if-break.patch patches/mageia/x86-default_poweroff_up_machines.patch @@ -78,7 +78,6 @@ i patches/mageia/gpu-drm-mach64-3.17-buildfix.patch patches/mageia/gpu-drm-mach64-3.18-buildfix.patch patches/mageia/input-i8042-quirks-for-Fujitsu-Lifebook-A544-and-Lif.patch - patches/mageia/media-Fix-regression-in-some-more-dib0700-based-devi.patch patches/mageia/net-sis190-fix-list-usage.patch patches/mageia/net-netfilter-IFWLOG.patch patches/mageia/net-netfilter-IFWLOG-mdv.patch @@ -178,6 +177,14 @@ i + + 2015-08-13 + 4.1.5 + Version bump to 4.1.5 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 + security + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-07-23 4.1.3