From: Greg Kroah-Hartman Date: Thu, 4 Jun 2015 08:15:03 +0000 (+0900) Subject: remove a patch for 3.14 X-Git-Tag: v3.10.80~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e16f9e312fed3c60479ba3add3cadbbfc2f477f;p=thirdparty%2Fkernel%2Fstable-queue.git remove a patch for 3.14 --- diff --git a/queue-3.14/series b/queue-3.14/series index 29b8e0b6f93..17ba4284c93 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -7,7 +7,6 @@ qla2xxx-remove-redundant-declaration-in-qla_gbl.h.patch kvm-mmu-fix-cr4.smep-1-cr0.wp-0-with-shadow-pages.patch net-socket-fix-the-wrong-returns-for-recvmsg-and-sendmsg.patch fs-omfs-add-null-terminator-in-the-end-up-the-token-list.patch -xfs-xfs_iozero-can-return-positive-errno.patch lguest-fix-out-by-one-error-in-address-checking.patch libceph-request-a-new-osdmap-if-lingering-request-maps-to-no-osd.patch xen-events-don-t-bind-non-percpu-virqs-with-percpu-chip.patch diff --git a/queue-3.14/staging-gdm724x-correction-of-variable-usage-after-applying-align.patch b/queue-3.14/staging-gdm724x-correction-of-variable-usage-after-applying-align.patch index 6a4c1668d79..11f8f7e02ff 100644 --- a/queue-3.14/staging-gdm724x-correction-of-variable-usage-after-applying-align.patch +++ b/queue-3.14/staging-gdm724x-correction-of-variable-usage-after-applying-align.patch @@ -1,13 +1,12 @@ From 892c89d5d7ffd1bb794fe54d86c0eef18d215fab Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C5=82awomir=20Demeszko?= - +From: Sławomir Demeszko Date: Tue, 5 May 2015 17:49:54 +0200 Subject: staging: gdm724x: Correction of variable usage after applying ALIGN() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -From: =?UTF-8?q?S=C5=82awomir=20Demeszko?= +From: Sławomir Demeszko commit 892c89d5d7ffd1bb794fe54d86c0eef18d215fab upstream. diff --git a/queue-3.14/xfs-xfs_iozero-can-return-positive-errno.patch b/queue-3.14/xfs-xfs_iozero-can-return-positive-errno.patch deleted file mode 100644 index a034e9dbb17..00000000000 --- a/queue-3.14/xfs-xfs_iozero-can-return-positive-errno.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cddc116228cb9d51d3224d23ba3e61fbbc3ec3d2 Mon Sep 17 00:00:00 2001 -From: Dave Chinner -Date: Fri, 29 May 2015 07:40:32 +1000 -Subject: xfs: xfs_iozero can return positive errno - -From: Dave Chinner - -commit cddc116228cb9d51d3224d23ba3e61fbbc3ec3d2 upstream. - -It was missed when we converted everything in XFs to use negative error -numbers, so fix it now. Bug introduced in 3.17 by commit 2451337 ("xfs: global -error sign conversion"), and should go back to stable kernels. - -Thanks to Brian Foster for noticing it. - -Signed-off-by: Dave Chinner -Reviewed-by: Brian Foster -Signed-off-by: Dave Chinner -Signed-off-by: Greg Kroah-Hartman - ---- - fs/xfs/xfs_file.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/fs/xfs/xfs_file.c -+++ b/fs/xfs/xfs_file.c -@@ -126,7 +126,7 @@ xfs_iozero( - status = 0; - } while (count); - -- return (-status); -+ return status; - } - - /* diff --git a/queue-4.0/staging-gdm724x-correction-of-variable-usage-after-applying-align.patch b/queue-4.0/staging-gdm724x-correction-of-variable-usage-after-applying-align.patch index 2e88e026f6d..b424c3ea2e4 100644 --- a/queue-4.0/staging-gdm724x-correction-of-variable-usage-after-applying-align.patch +++ b/queue-4.0/staging-gdm724x-correction-of-variable-usage-after-applying-align.patch @@ -1,13 +1,12 @@ From 892c89d5d7ffd1bb794fe54d86c0eef18d215fab Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C5=82awomir=20Demeszko?= - +From: Sławomir Demeszko Date: Tue, 5 May 2015 17:49:54 +0200 Subject: staging: gdm724x: Correction of variable usage after applying ALIGN() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -From: =?UTF-8?q?S=C5=82awomir=20Demeszko?= +From: Sławomir Demeszko commit 892c89d5d7ffd1bb794fe54d86c0eef18d215fab upstream.