[00/10] Stable material from OpenWrt

Message ID 20190214102436.5092-1-linus.walleij@linaro.org
Headers show
Series
  • Stable material from OpenWrt
Related show

Message

Linus Walleij Feb. 14, 2019, 10:24 a.m.
This is a series of patches used in OpenWrt's v4.9 backports
that seem to be of generic interest to v4.9.y

As a bunch of commits hit networking I CC DaveM and
here so the can nod/object to these, I think
the want a bit of control over what goes into networking
stable.

I avoided two patch sets dealing with IPv6 tunneling
and netfilter that seem to still be fixed and I feel generally
incompetent about.

For the remaining patches I cherry-picked the upstream
commits except for (8/10)
"netfilter: nf_tables: fix mismatch in big-endian system"
where I used OpenWrt's backport.

The list of upstream commits in patch order:
6db6f0eae6052b70885562e1733896647ec1d807
"bridge: multicast to unicast"
e9156cd26a495a18706e796f02a81fee41ec14f4
"smsc95xx: Use skb_cow_head to deal with cloned skbs"
6bc6895bdd6744e0136eaa4a11fbdb20a7db4e40
"ch9200: use skb_cow_head() to deal with cloned skbs"
39fba7835aacda65284a86e611774cbba71dac20
"kaweth: use skb_cow_head() to deal with cloned skbs"
854826c9d526fd81077742c3b000e3f7fcaef3ce
"ubifs: Drop softlimit and delta fields from struct ubifs_wbuf"
1b7fc2c0069f3864a3dda15430b7aded31c0bfcc
"ubifs: Use dirty_writeback_interval value for wbuf timer"
cd4b1e34655d46950c065d9284b596cd8d7b28cd
"usb: dwc2: Remove unnecessary kfree"
10596608c4d62cb8c1c2b806debcbd32fe657e7
"netfilter: nf_tables: fix mismatch in big-endian system"
65cab850f0eeaa9180bd2e10a231964f33743edf
"net: Allow class-e address assignment via ifconfig ioctl"
6926e041a8920c8ec27e4e155efa760aa01551fd
"uapi/if_ether.h: prevent redefinition of struct ethhdr"

Dave Taht (1):
  net: Allow class-e address assignment via ifconfig ioctl

Eric Dumazet (2):
  ch9200: use skb_cow_head() to deal with cloned skbs
  kaweth: use skb_cow_head() to deal with cloned skbs

Felix Fietkau (1):
  bridge: multicast to unicast

Hauke Mehrtens (1):
  uapi/if_ether.h: prevent redefinition of struct ethhdr

James Hughes (1):
  smsc95xx: Use skb_cow_head to deal with cloned skbs

John Youn (1):
  usb: dwc2: Remove unnecessary kfree

Liping Zhang (1):
  netfilter: nf_tables: fix mismatch in big-endian system

Rafał Miłecki (2):
  ubifs: Drop softlimit and delta fields from struct ubifs_wbuf
  ubifs: Use dirty_writeback_interval value for wbuf timer

 drivers/net/usb/ch9200.c            |  9 +--
 drivers/net/usb/kaweth.c            | 18 ++----
 drivers/net/usb/smsc95xx.c          | 12 ++--
 drivers/usb/dwc2/hcd.c              |  1 -
 fs/ubifs/io.c                       | 18 +++---
 fs/ubifs/ubifs.h                    |  9 ---
 include/linux/if_bridge.h           |  1 +
 include/net/netfilter/nf_tables.h   | 29 ++++++++++
 include/uapi/linux/if_ether.h       |  3 +
 include/uapi/linux/if_link.h        |  1 +
 include/uapi/linux/in.h             | 10 +++-
 include/uapi/linux/libc-compat.h    |  6 ++
 net/bridge/br_forward.c             | 39 ++++++++++++-
 net/bridge/br_mdb.c                 |  2 +-
 net/bridge/br_multicast.c           | 90 +++++++++++++++++++++--------
 net/bridge/br_netlink.c             |  5 ++
 net/bridge/br_private.h             |  3 +-
 net/bridge/br_sysfs_if.c            |  2 +
 net/ipv4/devinet.c                  |  5 +-
 net/ipv4/ipconfig.c                 |  2 +
 net/ipv4/netfilter/nft_masq_ipv4.c  |  8 +--
 net/ipv4/netfilter/nft_redir_ipv4.c |  8 +--
 net/ipv6/netfilter/nft_masq_ipv6.c  |  8 +--
 net/ipv6/netfilter/nft_redir_ipv6.c |  8 +--
 net/netfilter/nft_ct.c              | 10 ++--
 net/netfilter/nft_meta.c            | 42 +++++++-------
 net/netfilter/nft_nat.c             |  8 +--
 27 files changed, 235 insertions(+), 122 deletions(-)

-- 
2.20.1

Comments

Greg Kroah-Hartman Feb. 14, 2019, 10:42 a.m. | #1
On Thu, Feb 14, 2019 at 11:24:26AM +0100, Linus Walleij wrote:
> This is a series of patches used in OpenWrt's v4.9 backports

> that seem to be of generic interest to v4.9.y

> 

> As a bunch of commits hit networking I CC DaveM and

> here so the can nod/object to these, I think

> the want a bit of control over what goes into networking

> stable.

> 

> I avoided two patch sets dealing with IPv6 tunneling

> and netfilter that seem to still be fixed and I feel generally

> incompetent about.

> 

> For the remaining patches I cherry-picked the upstream

> commits except for (8/10)

> "netfilter: nf_tables: fix mismatch in big-endian system"

> where I used OpenWrt's backport.

> 

> The list of upstream commits in patch order:

> 6db6f0eae6052b70885562e1733896647ec1d807

> "bridge: multicast to unicast"

> e9156cd26a495a18706e796f02a81fee41ec14f4

> "smsc95xx: Use skb_cow_head to deal with cloned skbs"

> 6bc6895bdd6744e0136eaa4a11fbdb20a7db4e40

> "ch9200: use skb_cow_head() to deal with cloned skbs"

> 39fba7835aacda65284a86e611774cbba71dac20

> "kaweth: use skb_cow_head() to deal with cloned skbs"

> 854826c9d526fd81077742c3b000e3f7fcaef3ce

> "ubifs: Drop softlimit and delta fields from struct ubifs_wbuf"

> 1b7fc2c0069f3864a3dda15430b7aded31c0bfcc

> "ubifs: Use dirty_writeback_interval value for wbuf timer"

> cd4b1e34655d46950c065d9284b596cd8d7b28cd

> "usb: dwc2: Remove unnecessary kfree"

> 10596608c4d62cb8c1c2b806debcbd32fe657e7

> "netfilter: nf_tables: fix mismatch in big-endian system"

> 65cab850f0eeaa9180bd2e10a231964f33743edf

> "net: Allow class-e address assignment via ifconfig ioctl"

> 6926e041a8920c8ec27e4e155efa760aa01551fd

> "uapi/if_ether.h: prevent redefinition of struct ethhdr"


Ick that's hard to read.  Going with a bit longer line is better:

6db6f0eae6052b70885562e1733896647ec1d807 "bridge: multicast to unicast"
e9156cd26a495a18706e796f02a81fee41ec14f4 "smsc95xx: Use skb_cow_head to deal with cloned skbs"
6bc6895bdd6744e0136eaa4a11fbdb20a7db4e40 "ch9200: use skb_cow_head() to deal with cloned skbs"
39fba7835aacda65284a86e611774cbba71dac20 "kaweth: use skb_cow_head() to deal with cloned skbs"
854826c9d526fd81077742c3b000e3f7fcaef3ce "ubifs: Drop softlimit and delta fields from struct ubifs_wbuf"
1b7fc2c0069f3864a3dda15430b7aded31c0bfcc "ubifs: Use dirty_writeback_interval value for wbuf timer"
cd4b1e34655d46950c065d9284b596cd8d7b28cd "usb: dwc2: Remove unnecessary kfree"
10596608c4d62cb8c1c2b806debcbd32fe657e7 "netfilter: nf_tables: fix mismatch in big-endian system"
65cab850f0eeaa9180bd2e10a231964f33743edf "net: Allow class-e address assignment via ifconfig ioctl"
6926e041a8920c8ec27e4e155efa760aa01551fd "uapi/if_ether.h: prevent redefinition of struct ethhdr"

Or better yet, use the "standard" way we reference ids in the kernel:
6db6f0eae605 ("bridge: multicast to unicast")
e9156cd26a49 ("smsc95xx: Use skb_cow_head to deal with cloned skbs")
...

Anyway, I need those ids in the patches themselves, as we do for all
stable patches (look at how they look in the stable trees for examples).

Also, some of these are in kernels newer than 4.14, so if I were to
apply them to 4.9 only, someone moving to a newer kernel would have a
regression, which isn't ok.

65cab850f0ee ("net: Allow class-e address assignment via ifconfig
ioctl") is one such example of that type of patch.

So I can't take these as-is, sorry.

greg k-h
Linus Walleij Feb. 14, 2019, 11:58 a.m. | #2
On Thu, Feb 14, 2019 at 11:42 AM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:

> Also, some of these are in kernels newer than 4.14, so if I were to

> apply them to 4.9 only, someone moving to a newer kernel would have a

> regression, which isn't ok.

>

> 65cab850f0ee ("net: Allow class-e address assignment via ifconfig

> ioctl") is one such example of that type of patch.

>

> So I can't take these as-is, sorry.


OK I will look closer for each of them and try to mention which stable
each of them should go to, I thought they would all be for v4.9
but I was wrong. I'll update and respin, NP.

Yours,
Linus Walleij