3.18-stable patches

added patches:
	fix-qla2xxx-terminate-exchange-when-command-is-aborted-by-lio.patch
	fix-tunnels-don-t-apply-gro-to-multiple-layers-of-encapsulation.patch

diff --git a/queue-3.18/fix-qla2xxx-terminate-exchange-when-command-is-aborted-by-lio.patch b/queue-3.18/fix-qla2xxx-terminate-exchange-when-command-is-aborted-by-lio.patch
new file mode 100644 (file)
index 0000000..d4fa720
--- /dev/null
+++ b/queue-3.18/fix-qla2xxx-terminate-exchange-when-command-is-aborted-by-lio.patch
@@ -0,0 +1,39 @@
+From foo@baz Tue Feb  7 17:42:33 CET 2017
+Date: Tue, 07 Feb 2017 17:42:33 +0100
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: Fix "qla2xxx: terminate exchange when command is aborted by LIO"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This fixes commit f67924cc39badbc813bd1935f9a025065a6a6534 which was
+commit 7359df25a53386dd33c223672bbd12cb49d0ce4f upstream.
+
+When backporting the patch, there was an unused variable, and the printk
+type was incorrect.  Fix this up by moving back to the correct type as
+shown in commit 649ee05499d1257a3af0e10d961a1c52d9ef95b7 and remove the
+unneeded variable.
+
+This fixes up two build warnings.
+
+Cc: Sasha Levin <alexander.levin@verizon.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/scsi/qla2xxx/qla_target.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/scsi/qla2xxx/qla_target.c
++++ b/drivers/scsi/qla2xxx/qla_target.c
+@@ -3075,11 +3075,10 @@ void qlt_abort_cmd(struct qla_tgt_cmd *c
+ {
+       struct qla_tgt *tgt = cmd->tgt;
+       struct scsi_qla_host *vha = tgt->vha;
+-      struct se_cmd *se_cmd = &cmd->se_cmd;
+ 
+       ql_dbg(ql_dbg_tgt_mgt, vha, 0xf014,
+           "qla_target(%d): terminating exchange for aborted cmd=%p "
+-          "(se_cmd=%p, tag=%llu)", vha->vp_idx, cmd, &cmd->se_cmd,
++          "(se_cmd=%p, tag=%d)", vha->vp_idx, cmd, &cmd->se_cmd,
+           cmd->tag);
+ 
+       cmd->state = QLA_TGT_STATE_ABORTED;

diff --git a/queue-3.18/fix-tunnels-don-t-apply-gro-to-multiple-layers-of-encapsulation.patch b/queue-3.18/fix-tunnels-don-t-apply-gro-to-multiple-layers-of-encapsulation.patch
new file mode 100644 (file)
index 0000000..8ea53af
--- /dev/null
+++ b/queue-3.18/fix-tunnels-don-t-apply-gro-to-multiple-layers-of-encapsulation.patch
@@ -0,0 +1,40 @@
+From foo@baz Tue Feb  7 17:25:25 CET 2017
+Date: Tue, 07 Feb 2017 17:25:25 +0100
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: Fix "tunnels: Don't apply GRO to multiple layers of encapsulation."
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+Commit dd4fff23f0f4c7c5414f50c091c78a7e423f85da which is commit
+fac8e0f579695a3ecbc4d3cac369139d7f819971 upstream, seems to have
+included the sit_gro_receive function, yet it never is used, causing an
+obvious warning message.  Hook it up to the correct sit_offload
+structure.
+
+Note, for 3.16, the backport of fac8e0f579695a3ecbc4d3cac369139d7f819971
+does not include this function, nor the ipip case.  I'm guessing that
+this is not correct for 3.18, as one of the functions was included, but
+could be totally wrong.
+
+Cc: Jesse Gross <jesse@kernel.org>
+Cc: David S. Miller <davem@davemloft.net>
+Cc: Ben Hutchings <ben@decadent.org.uk>
+Cc: Sasha Levin <alexander.levin@verizon.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/ipv6/ip6_offload.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/ipv6/ip6_offload.c
++++ b/net/ipv6/ip6_offload.c
+@@ -305,7 +305,7 @@ static struct packet_offload ipv6_packet
+ static const struct net_offload sit_offload = {
+       .callbacks = {
+               .gso_segment    = ipv6_gso_segment,
+-              .gro_receive    = ipv6_gro_receive,
++              .gro_receive    = sit_gro_receive,
+               .gro_complete   = ipv6_gro_complete,
+       },
+ };

diff --git a/queue-3.18/series b/queue-3.18/series
index 69d3c6eb0f02450d01abe1aef424126bd420dab6..a22d0c035dbbc3382fc375854631ebfad740965b 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -29,4 +29,7 @@ spi-dw-mid-refactor-to-use-helpers.patch
 blk-rq_data_dir-should-not-return-a-boolean.patch
 net-add-sysctl_max_skb_frags.patch
 drm-i915-cleanup-some-indenting.patch
+documentation-remove-zboot-mmc-sdhi-utility-and-docs.patch
 fix-crypto-algif_hash-require-setkey-before-accept-2.patch
+fix-tunnels-don-t-apply-gro-to-multiple-layers-of-encapsulation.patch
+fix-qla2xxx-terminate-exchange-when-command-is-aborted-by-lio.patch