diff mbox

[OpenWrt-Devel,001/001,kernel] Bump linux LTS kernel from 4.4.7 to 4.4.9

Message ID CAD2Yd_aOAOFMNmUPpmwKw0yTzHwfEFFe2iDU=pWTF=qstWq+oQ@mail.gmail.com
State Superseded, archived
Headers show

Commit Message

Graham Fairweather May 9, 2016, 7:48 a.m. UTC
From: Graham Fairweather <xotic750@gmail.com>

Increment PATCH number, added MD5 sum for release.
Patches were refreshed.
*https://www.kernel.org/ <https://www.kernel.org/>*
Signed-off-by: Graham Fairweather <xotic750@gmail.com>
---
 include/kernel-version.mk
                       |  4 ++--
 target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
|  2 +-
 target/linux/brcm63xx/patches-4.4/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch
   |  4 ++--
 target/linux/brcm63xx/patches-4.4/414-MTD-m25p80-allow-passing-pp_data.patch
                    |  2 +-
 target/linux/generic/patches-4.4/045-mtd-devices-m25p80-add-support-for-mmap-read-request.patch
 |  2 +-
 target/linux/generic/patches-4.4/081-spi-bcm53xx-add-spi_flash_read-callback-for-MMIO-bas.patch
 | 12 ++++++------
 target/linux/generic/patches-4.4/630-packet_socket_type.patch
                       | 10 +++++-----
 target/linux/generic/patches-4.4/642-bridge_port_isolate.patch
                      |  4 ++--
 target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch
                      |  4 ++--
 target/linux/generic/patches-4.4/655-increase_skb_pad.patch
                       |  2 +-
 target/linux/generic/patches-4.4/656-skb_reduce_truesize-helper.patch
                       |  2 +-
 target/linux/generic/patches-4.4/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
                 | 26 +++++++++++++-------------
 target/linux/generic/patches-4.4/721-phy_packets.patch
                      |  8 ++++----
 target/linux/generic/patches-4.4/903-debloat_direct_io.patch
                      |  4 ++--
 14 files changed, 43 insertions(+), 43 deletions(-)
diff mbox

Patch

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index ba6bf66..cdb404f 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -5,12 +5,12 @@  LINUX_RELEASE?=1
 LINUX_VERSION-3.18 = .29
 LINUX_VERSION-4.1 = .23
 LINUX_VERSION-4.3 = .4
-LINUX_VERSION-4.4 = .7
+LINUX_VERSION-4.4 = .9

 LINUX_KERNEL_MD5SUM-3.18.29 = b25737a0bc98e80d12200de93f239c28
 LINUX_KERNEL_MD5SUM-4.1.23 = 5cb969fa874e110118722398b7c72c5d
 LINUX_KERNEL_MD5SUM-4.3.4 = 5275d02132107c28b85f986bad576d91
-LINUX_KERNEL_MD5SUM-4.4.7 = 4345597c9a10bd73c28b6ae3a854d8d7
+LINUX_KERNEL_MD5SUM-4.4.9 = ec1e5011cc2ab3f441e39716dcf4730e

 ifdef KERNEL_PATCHVER
   LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip
$(LINUX_VERSION-$(KERNEL_PATCHVER)))
diff --git
a/target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
b/target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
index be62e67..4793836 100644
---
a/target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
+++
b/target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
@@ -11,7 +11,7 @@  Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -229,7 +229,8 @@ static int m25p_probe(struct spi_device
+@@ -251,7 +251,8 @@ static int m25p_probe(struct spi_device

  ppdata.of_node = spi->dev.of_node;

diff --git
a/target/linux/brcm63xx/patches-4.4/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch
b/target/linux/brcm63xx/patches-4.4/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch
index 3877442..75a874d 100644
---
a/target/linux/brcm63xx/patches-4.4/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch
+++
b/target/linux/brcm63xx/patches-4.4/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch
@@ -28,7 +28,7 @@  Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  size_t *retlen, u_char *buf)
  {
  struct m25p *flash = nor->priv;
-@@ -152,6 +153,29 @@ static int m25p80_read(struct spi_nor *n
+@@ -174,6 +175,29 @@ static int m25p80_read(struct spi_nor *n
  return 0;
  }

@@ -58,7 +58,7 @@  Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  static int m25p80_erase(struct spi_nor *nor, loff_t offset)
  {
  struct m25p *flash = nor->priv;
-@@ -223,6 +247,9 @@ static int m25p_probe(struct spi_device
+@@ -245,6 +269,9 @@ static int m25p_probe(struct spi_device
  else
  flash_name = spi->modalias;

diff --git
a/target/linux/brcm63xx/patches-4.4/414-MTD-m25p80-allow-passing-pp_data.patch
b/target/linux/brcm63xx/patches-4.4/414-MTD-m25p80-allow-passing-pp_data.patch
index e421e9a..bbb565e 100644
---
a/target/linux/brcm63xx/patches-4.4/414-MTD-m25p80-allow-passing-pp_data.patch
+++
b/target/linux/brcm63xx/patches-4.4/414-MTD-m25p80-allow-passing-pp_data.patch
@@ -10,7 +10,7 @@  Subject: [PATCH 64/79] MTD: m25p80: allow passing pp_data

 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -250,6 +250,9 @@ static int m25p_probe(struct spi_device
+@@ -272,6 +272,9 @@ static int m25p_probe(struct spi_device
  if (data)
  flash->max_transfer_len = data->max_transfer_len;

diff --git
a/target/linux/generic/patches-4.4/045-mtd-devices-m25p80-add-support-for-mmap-read-request.patch
b/target/linux/generic/patches-4.4/045-mtd-devices-m25p80-add-support-for-mmap-read-request.patch
index ee85f44..c4c7e6e 100644
---
a/target/linux/generic/patches-4.4/045-mtd-devices-m25p80-add-support-for-mmap-read-request.patch
+++
b/target/linux/generic/patches-4.4/045-mtd-devices-m25p80-add-support-for-mmap-read-request.patch
@@ -15,7 +15,7 @@  Signed-off-by: Brian Norris <computersforpeace@gmail.com>

 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -131,6 +131,28 @@ static int m25p80_read(struct spi_nor *nor, loff_t
from, size_t len,
+@@ -131,6 +131,28 @@ static int m25p80_read(struct spi_nor *n
  /* convert the dummy cycles to the number of bytes */
  dummy /= 8;

diff --git
a/target/linux/generic/patches-4.4/081-spi-bcm53xx-add-spi_flash_read-callback-for-MMIO-bas.patch
b/target/linux/generic/patches-4.4/081-spi-bcm53xx-add-spi_flash_read-callback-for-MMIO-bas.patch
index 5f131e7..730f41e 100644
---
a/target/linux/generic/patches-4.4/081-spi-bcm53xx-add-spi_flash_read-callback-for-MMIO-bas.patch
+++
b/target/linux/generic/patches-4.4/081-spi-bcm53xx-add-spi_flash_read-callback-for-MMIO-bas.patch
@@ -34,7 +34,7 @@  Signed-off-by: Mark Brown <broonie@kernel.org>
  };

  static inline u32 bcm53xxspi_read(struct bcm53xxspi *b53spi, u16 offset)
-@@ -32,6 +35,50 @@ static inline void bcm53xxspi_write(struct bcm53xxspi
*b53spi, u16 offset,
+@@ -32,6 +35,50 @@ static inline void bcm53xxspi_write(stru
  bcma_write32(b53spi->core, offset, value);
  }

@@ -85,7 +85,7 @@  Signed-off-by: Mark Brown <broonie@kernel.org>
  static inline unsigned int bcm53xxspi_calc_timeout(size_t len)
  {
  /* Do some magic calculation based on length and buad. Add 10% and 1. */
-@@ -176,6 +223,8 @@ static int bcm53xxspi_transfer_one(struct spi_master
*master,
+@@ -176,6 +223,8 @@ static int bcm53xxspi_transfer_one(struc
  u8 *buf;
  size_t left;

@@ -94,7 +94,7 @@  Signed-off-by: Mark Brown <broonie@kernel.org>
  if (t->tx_buf) {
  buf = (u8 *)t->tx_buf;
  left = t->len;
-@@ -206,6 +255,22 @@ static int bcm53xxspi_transfer_one(struct spi_master
*master,
+@@ -206,6 +255,22 @@ static int bcm53xxspi_transfer_one(struc
  return 0;
  }

@@ -117,7 +117,7 @@  Signed-off-by: Mark Brown <broonie@kernel.org>
  /**************************************************
   * BCMA
   **************************************************/
-@@ -222,6 +287,7 @@ MODULE_DEVICE_TABLE(bcma, bcm53xxspi_bcma_tbl);
+@@ -222,6 +287,7 @@ MODULE_DEVICE_TABLE(bcma, bcm53xxspi_bcm

  static int bcm53xxspi_bcma_probe(struct bcma_device *core)
  {
@@ -125,7 +125,7 @@  Signed-off-by: Mark Brown <broonie@kernel.org>
  struct bcm53xxspi *b53spi;
  struct spi_master *master;
  int err;
-@@ -231,7 +297,7 @@ static int bcm53xxspi_bcma_probe(struct bcma_device
*core)
+@@ -231,7 +297,7 @@ static int bcm53xxspi_bcma_probe(struct
  return -ENOTSUPP;
  }

@@ -134,7 +134,7 @@  Signed-off-by: Mark Brown <broonie@kernel.org>
  if (!master)
  return -ENOMEM;

-@@ -239,11 +305,19 @@ static int bcm53xxspi_bcma_probe(struct bcma_device
*core)
+@@ -239,11 +305,19 @@ static int bcm53xxspi_bcma_probe(struct
  b53spi->master = master;
  b53spi->core = core;

diff --git a/target/linux/generic/patches-4.4/630-packet_socket_type.patch
b/target/linux/generic/patches-4.4/630-packet_socket_type.patch
index d649bf0..48c4220 100644
--- a/target/linux/generic/patches-4.4/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-4.4/630-packet_socket_type.patch
@@ -51,7 +51,7 @@  Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  goto out;

  if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -1982,12 +1984,12 @@ static int packet_rcv(struct sk_buff *sk
+@@ -1986,12 +1988,12 @@ static int packet_rcv(struct sk_buff *sk
  int skb_len = skb->len;
  unsigned int snaplen, res;

@@ -67,7 +67,7 @@  Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  if (!net_eq(dev_net(dev), sock_net(sk)))
  goto drop;

-@@ -2107,12 +2109,12 @@ static int tpacket_rcv(struct sk_buff *s
+@@ -2111,12 +2113,12 @@ static int tpacket_rcv(struct sk_buff *s
  BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
  BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);

@@ -83,7 +83,7 @@  Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  if (!net_eq(dev_net(dev), sock_net(sk)))
  goto drop;

-@@ -3097,6 +3099,7 @@ static int packet_create(struct net *net
+@@ -3092,6 +3094,7 @@ static int packet_create(struct net *net
  mutex_init(&po->pg_vec_lock);
  po->rollover = NULL;
  po->prot_hook.func = packet_rcv;
@@ -91,7 +91,7 @@  Signed-off-by: Felix Fietkau <nbd@openwrt.org>

  if (sock->type == SOCK_PACKET)
  po->prot_hook.func = packet_rcv_spkt;
-@@ -3712,6 +3715,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3707,6 +3710,16 @@ packet_setsockopt(struct socket *sock, i
  po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
  return 0;
  }
@@ -108,7 +108,7 @@  Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  default:
  return -ENOPROTOOPT;
  }
-@@ -3764,6 +3777,13 @@ static int packet_getsockopt(struct sock
+@@ -3759,6 +3772,13 @@ static int packet_getsockopt(struct sock
  case PACKET_VNET_HDR:
  val = po->has_vnet_hdr;
  break;
diff --git a/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch
b/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch
index 0be8c8f..1dc32b6 100644
--- a/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch
+++ b/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch
@@ -11,8 +11,8 @@  Isolating individual bridge ports
  #define BR_PROXYARP_WIFI BIT(10)
 +#define BR_ISOLATE_MODE BIT(11)

- /* values as per ieee8021QBridgeFdbAgingTime */
- #define BR_MIN_AGEING_TIME (10 * HZ)
+ #define BR_DEFAULT_AGEING_TIME (300 * HZ)
+
 --- a/net/bridge/br_sysfs_if.c
 +++ b/net/bridge/br_sysfs_if.c
 @@ -173,6 +173,22 @@ BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD
diff --git
a/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch
b/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch
index 59aa1ed..f729f38 100644
--- a/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch
+++ b/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch
@@ -11,8 +11,8 @@  Implement optinal multicast->unicast conversion for igmp
snooping
  #define BR_ISOLATE_MODE BIT(11)
 +#define BR_MULTICAST_TO_UCAST BIT(12)

- /* values as per ieee8021QBridgeFdbAgingTime */
- #define BR_MIN_AGEING_TIME (10 * HZ)
+ #define BR_DEFAULT_AGEING_TIME (300 * HZ)
+
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
 @@ -42,12 +42,13 @@ static void br_multicast_add_router(stru
diff --git a/target/linux/generic/patches-4.4/655-increase_skb_pad.patch
b/target/linux/generic/patches-4.4/655-increase_skb_pad.patch
index e46e470..ad95d4c 100644
--- a/target/linux/generic/patches-4.4/655-increase_skb_pad.patch
+++ b/target/linux/generic/patches-4.4/655-increase_skb_pad.patch
@@ -1,6 +1,6 @@ 
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -2155,7 +2155,7 @@ static inline int pskb_network_may_pull(
+@@ -2179,7 +2179,7 @@ static inline int pskb_network_may_pull(
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD
diff --git
a/target/linux/generic/patches-4.4/656-skb_reduce_truesize-helper.patch
b/target/linux/generic/patches-4.4/656-skb_reduce_truesize-helper.patch
index 341a31b..dad7448 100644
--- a/target/linux/generic/patches-4.4/656-skb_reduce_truesize-helper.patch
+++ b/target/linux/generic/patches-4.4/656-skb_reduce_truesize-helper.patch
@@ -14,7 +14,7 @@  when needed.

 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -2200,6 +2200,24 @@ static inline void pskb_trim_unique(stru
+@@ -2224,6 +2224,24 @@ static inline void pskb_trim_unique(stru
  BUG_ON(err);
  }

diff --git
a/target/linux/generic/patches-4.4/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
b/target/linux/generic/patches-4.4/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
index 7123c80..0d4409e 100644
---
a/target/linux/generic/patches-4.4/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
+++
b/target/linux/generic/patches-4.4/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -295,15 +295,15 @@  Signed-off-by: Steven Barth <cyrus@openwrt.org>

  __skb_tunnel_rx(skb, t->dev, t->net);

-@@ -1179,6 +1316,7 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
+@@ -1224,6 +1361,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
  __u32 mtu;
  u8 tproto;
  int err;
 + struct __ip6_tnl_fmr *fmr;

  tproto = ACCESS_ONCE(t->parms.proto);
- if (tproto != IPPROTO_IPIP && tproto != 0)
-@@ -1198,6 +1336,18 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
+ if ((tproto != IPPROTO_IPV6 && tproto != 0) ||
+@@ -1254,6 +1392,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
  if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
  fl6.flowi6_mark = skb->mark;

@@ -321,8 +321,8 @@  Signed-off-by: Steven Barth <cyrus@openwrt.org>
 +
  err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu);
  if (err != 0) {
- /* XXX: send ICMP error even if DF is not set. */
-@@ -1366,6 +1516,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
+ if (err == -EMSGSIZE)
+@@ -1368,6 +1518,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
  t->parms.flowinfo = p->flowinfo;
  t->parms.link = p->link;
  t->parms.proto = p->proto;
@@ -337,7 +337,7 @@  Signed-off-by: Steven Barth <cyrus@openwrt.org>
  ip6_tnl_dst_reset(t);
  ip6_tnl_link_config(t);
  return 0;
-@@ -1404,6 +1562,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
+@@ -1406,6 +1564,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
  p->flowinfo = u->flowinfo;
  p->link = u->link;
  p->proto = u->proto;
@@ -345,7 +345,7 @@  Signed-off-by: Steven Barth <cyrus@openwrt.org>
  memcpy(p->name, u->name, sizeof(u->name));
  }

-@@ -1699,6 +1858,15 @@ static int ip6_tnl_validate(struct nlatt
+@@ -1701,6 +1860,15 @@ static int ip6_tnl_validate(struct nlatt
  return 0;
  }

@@ -361,7 +361,7 @@  Signed-off-by: Steven Barth <cyrus@openwrt.org>
  static void ip6_tnl_netlink_parms(struct nlattr *data[],
   struct __ip6_tnl_parm *parms)
  {
-@@ -1730,6 +1898,46 @@ static void ip6_tnl_netlink_parms(struct
+@@ -1732,6 +1900,46 @@ static void ip6_tnl_netlink_parms(struct

  if (data[IFLA_IPTUN_PROTO])
  parms->proto = nla_get_u8(data[IFLA_IPTUN_PROTO]);
@@ -408,7 +408,7 @@  Signed-off-by: Steven Barth <cyrus@openwrt.org>
  }

  static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
-@@ -1782,6 +1990,12 @@ static void ip6_tnl_dellink(struct net_d
+@@ -1784,6 +1992,12 @@ static void ip6_tnl_dellink(struct net_d

  static size_t ip6_tnl_get_size(const struct net_device *dev)
  {
@@ -421,7 +421,7 @@  Signed-off-by: Steven Barth <cyrus@openwrt.org>
  return
  /* IFLA_IPTUN_LINK */
  nla_total_size(4) +
-@@ -1799,6 +2013,24 @@ static size_t ip6_tnl_get_size(const str
+@@ -1801,6 +2015,24 @@ static size_t ip6_tnl_get_size(const str
  nla_total_size(4) +
  /* IFLA_IPTUN_PROTO */
  nla_total_size(1) +
@@ -446,7 +446,7 @@  Signed-off-by: Steven Barth <cyrus@openwrt.org>
  0;
  }

-@@ -1806,6 +2038,9 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -1808,6 +2040,9 @@ static int ip6_tnl_fill_info(struct sk_b
  {
  struct ip6_tnl *tunnel = netdev_priv(dev);
  struct __ip6_tnl_parm *parm = &tunnel->parms;
@@ -456,7 +456,7 @@  Signed-off-by: Steven Barth <cyrus@openwrt.org>

  if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
     nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
-@@ -1814,8 +2049,27 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -1816,8 +2051,27 @@ static int ip6_tnl_fill_info(struct sk_b
     nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||
     nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
     nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
@@ -485,7 +485,7 @@  Signed-off-by: Steven Barth <cyrus@openwrt.org>
  return 0;

  nla_put_failure:
-@@ -1839,6 +2093,7 @@ static const struct nla_policy ip6_tnl_p
+@@ -1841,6 +2095,7 @@ static const struct nla_policy ip6_tnl_p
  [IFLA_IPTUN_FLOWINFO] = { .type = NLA_U32 },
  [IFLA_IPTUN_FLAGS] = { .type = NLA_U32 },
  [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
diff --git a/target/linux/generic/patches-4.4/721-phy_packets.patch
b/target/linux/generic/patches-4.4/721-phy_packets.patch
index 04bafcd..79af5f9 100644
--- a/target/linux/generic/patches-4.4/721-phy_packets.patch
+++ b/target/linux/generic/patches-4.4/721-phy_packets.patch
@@ -1,6 +1,6 @@ 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -1297,6 +1297,7 @@ enum netdev_priv_flags {
+@@ -1298,6 +1298,7 @@ enum netdev_priv_flags {
  IFF_NO_QUEUE = 1<<21,
  IFF_OPENVSWITCH = 1<<22,
  IFF_L3MDEV_SLAVE = 1<<23,
@@ -8,7 +8,7 @@ 
  };

  #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
-@@ -1323,6 +1324,7 @@ enum netdev_priv_flags {
+@@ -1324,6 +1325,7 @@ enum netdev_priv_flags {
  #define IFF_NO_QUEUE IFF_NO_QUEUE
  #define IFF_OPENVSWITCH IFF_OPENVSWITCH
  #define IFF_L3MDEV_SLAVE IFF_L3MDEV_SLAVE
@@ -41,7 +41,7 @@ 
   */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -2186,6 +2186,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2210,6 +2210,10 @@ static inline int pskb_trim(struct sk_bu
  return (len < skb->len) ? __pskb_trim(skb, len) : 0;
  }

@@ -52,7 +52,7 @@ 
  /**
   * pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   * @skb: buffer to alter
-@@ -2308,16 +2312,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2332,16 +2336,6 @@ static inline struct sk_buff *dev_alloc_
  }


diff --git a/target/linux/generic/patches-4.4/903-debloat_direct_io.patch
b/target/linux/generic/patches-4.4/903-debloat_direct_io.patch
index ee85c40..460da1d 100644
--- a/target/linux/generic/patches-4.4/903-debloat_direct_io.patch
+++ b/target/linux/generic/patches-4.4/903-debloat_direct_io.patch
@@ -26,7 +26,7 @@ 
  endif
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -2681,6 +2681,7 @@ enum {
+@@ -2691,6 +2691,7 @@ enum {
  DIO_SKIP_DIO_COUNT = 0x08,
  };

@@ -34,7 +34,7 @@ 
  void dio_end_io(struct bio *bio, int error);

  ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
-@@ -2688,6 +2689,18 @@ ssize_t __blockdev_direct_IO(struct kioc
+@@ -2698,6 +2699,18 @@ ssize_t __blockdev_direct_IO(struct kioc
      loff_t offset, get_block_t get_block,
      dio_iodone_t end_io, dio_submit_t submit_io,
      int flags);