[SRU][lts-linux-vivid][PATCH 0/3] Fixes for bug lp1541330

[Joseph Salisbury]

BugLink: http://bugs.launchpad.net/bugs/1541330


== SRU Justification ==
ip_vti/ip6_vti is broken with the lts-linux-vivid kernel.  The three commits 
in this SRU request resolve the bug. 

This bug was introudced in Vivid when commit 213dd74a  was introduced with the
3.19.6 stable updates(See tracking bug http://pad.lv/1451996). 

All three commits were included in mainline as of v4.1-rc7. 

These commits are only needed in the lts-linux-vivid kernel.


== Fixes ==
commit cd5279c194f89c9b97c294af4aaf4ea8c5e3c704
Author: Alexander Duyck <alexander.h.duyck at redhat.com>
Date:   Wed May 27 07:16:43 2015 -0700

    ip_vti/ip6_vti: Do not touch skb->mark on xmit

commit 049f8e2e28d9c3dac0744cc2f19d3157c7fb5646
Author: Alexander Duyck <alexander.h.duyck at redhat.com>
Date:   Wed May 27 07:16:49 2015 -0700

    xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_input

commit d55c670cbc54b2270a465cdc382ce71adae45785
Author: Alexander Duyck <alexander.h.duyck at redhat.com>
Date:   Wed May 27 07:16:54 2015 -0700

    ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call



== Test Case ==
A test kernel was built with this patch and tested by the original bug reporter.
The bug reporter states the test kernel resolved the bug.



Alexander Duyck (3):
  ip_vti/ip6_vti: Do not touch skb->mark on xmit
  xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_input
  ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call

 net/ipv4/ip_vti.c     | 14 ++++++++++----
 net/ipv6/ip6_vti.c    | 13 ++++++++++---
 net/xfrm/xfrm_input.c | 17 ++++++++++++++++-
 3 files changed, 36 insertions(+), 8 deletions(-)

-- 
1.9.1