| Message ID | 20171226193002.52335-1-ldir@darbyshire-bryant.me.uk |
|---|---|
| State | Accepted |
| Delegated to: | John Crispin |
| Headers | show |
| Series | [LEDE-DEV,v1] kernel: bump 4.4 to 4.4.108 for 17.01 | expand |
Hi Kevin, fails to apply for me ?! John On 26/12/17 20:30, Kevin Darbyshire-Bryant wrote: > Refresh patches. > > Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> > --- > include/kernel-version.mk | 4 ++-- > target/linux/generic/patches-4.4/653-disable_netlink_trim.patch | 2 +- > .../204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/include/kernel-version.mk b/include/kernel-version.mk > index 1e699a4e4b..fc7f46f6e2 100644 > --- a/include/kernel-version.mk > +++ b/include/kernel-version.mk > @@ -3,10 +3,10 @@ > LINUX_RELEASE?=1 > > LINUX_VERSION-3.18 = .43 > -LINUX_VERSION-4.4 = .107 > +LINUX_VERSION-4.4 = .108 > > LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c > -LINUX_KERNEL_HASH-4.4.107 = d25dc23c8b05d34518ede68f03668cd344f805049a16bc4f189da90533881a17 > +LINUX_KERNEL_HASH-4.4.108 = 5a001198625ce9f7b0ef1e4b43e033aea859e1ef3509532412cce8f0375ba51a > > ifdef KERNEL_PATCHVER > LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) > diff --git a/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch b/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch > index cc19b8ef33..5f46885708 100644 > --- a/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch > +++ b/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch > @@ -1,6 +1,6 @@ > --- a/net/netlink/af_netlink.c > +++ b/net/netlink/af_netlink.c > -@@ -1187,24 +1187,7 @@ void netlink_detachskb(struct sock *sk, > +@@ -1228,24 +1228,7 @@ void netlink_detachskb(struct sock *sk, > > static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) > { > diff --git a/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch b/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch > index 1d3dcb29ab..4f99418a01 100644 > --- a/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch > +++ b/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch > @@ -246,7 +246,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> > #ifdef CONFIG_IGB_HWMON > igb_sysfs_exit(adapter); > #endif > -@@ -3111,6 +3243,12 @@ static int __igb_open(struct net_device > +@@ -3113,6 +3245,12 @@ static int __igb_open(struct net_device > if (!resuming) > pm_runtime_put(&pdev->dev); > > @@ -259,7 +259,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> > /* start the watchdog. */ > hw->mac.get_link_status = 1; > schedule_work(&adapter->watchdog_task); > -@@ -7104,21 +7242,41 @@ void igb_alloc_rx_buffers(struct igb_rin > +@@ -7106,21 +7244,41 @@ void igb_alloc_rx_buffers(struct igb_rin > static int igb_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) > { > struct igb_adapter *adapter = netdev_priv(netdev);
On 30/12/17 00:22, John Crispin wrote: > Hi Kevin, > > fails to apply for me ?! > > John > my bad, applied, Thanks ! John > > On 26/12/17 20:30, Kevin Darbyshire-Bryant wrote: >> Refresh patches. >> >> Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> >> --- >> include/kernel-version.mk | 4 ++-- >> target/linux/generic/patches-4.4/653-disable_netlink_trim.patch | 2 +- >> .../204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch | 4 >> ++-- >> 3 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/include/kernel-version.mk b/include/kernel-version.mk >> index 1e699a4e4b..fc7f46f6e2 100644 >> --- a/include/kernel-version.mk >> +++ b/include/kernel-version.mk >> @@ -3,10 +3,10 @@ >> LINUX_RELEASE?=1 >> LINUX_VERSION-3.18 = .43 >> -LINUX_VERSION-4.4 = .107 >> +LINUX_VERSION-4.4 = .108 >> LINUX_KERNEL_HASH-3.18.43 = >> 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c >> -LINUX_KERNEL_HASH-4.4.107 = >> d25dc23c8b05d34518ede68f03668cd344f805049a16bc4f189da90533881a17 >> +LINUX_KERNEL_HASH-4.4.108 = >> 5a001198625ce9f7b0ef1e4b43e033aea859e1ef3509532412cce8f0375ba51a >> ifdef KERNEL_PATCHVER >> LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip >> $(LINUX_VERSION-$(KERNEL_PATCHVER))) >> diff --git >> a/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch >> b/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch >> index cc19b8ef33..5f46885708 100644 >> --- a/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch >> +++ b/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch >> @@ -1,6 +1,6 @@ >> --- a/net/netlink/af_netlink.c >> +++ b/net/netlink/af_netlink.c >> -@@ -1187,24 +1187,7 @@ void netlink_detachskb(struct sock *sk, >> +@@ -1228,24 +1228,7 @@ void netlink_detachskb(struct sock *sk, >> static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t >> allocation) >> { >> diff --git >> a/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch >> b/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch >> >> index 1d3dcb29ab..4f99418a01 100644 >> --- >> a/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch >> +++ >> b/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch >> @@ -246,7 +246,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> >> #ifdef CONFIG_IGB_HWMON >> igb_sysfs_exit(adapter); >> #endif >> -@@ -3111,6 +3243,12 @@ static int __igb_open(struct net_device >> +@@ -3113,6 +3245,12 @@ static int __igb_open(struct net_device >> if (!resuming) >> pm_runtime_put(&pdev->dev); >> @@ -259,7 +259,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> >> /* start the watchdog. */ >> hw->mac.get_link_status = 1; >> schedule_work(&adapter->watchdog_task); >> -@@ -7104,21 +7242,41 @@ void igb_alloc_rx_buffers(struct igb_rin >> +@@ -7106,21 +7244,41 @@ void igb_alloc_rx_buffers(struct igb_rin >> static int igb_mii_ioctl(struct net_device *netdev, struct ifreq >> *ifr, int cmd) >> { >> struct igb_adapter *adapter = netdev_priv(netdev); > > > _______________________________________________ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev
> On 29 Dec 2017, at 23:36, John Crispin <john@phrozen.org> wrote: > > > > On 30/12/17 00:22, John Crispin wrote: >> Hi Kevin, >> >> fails to apply for me ?! >> >> John >> > > my bad, applied, Thanks ! > John > hehe :-) np. Had me checking though :-) Kevin
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 1e699a4e4b..fc7f46f6e2 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,10 +3,10 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .43 -LINUX_VERSION-4.4 = .107 +LINUX_VERSION-4.4 = .108 LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c -LINUX_KERNEL_HASH-4.4.107 = d25dc23c8b05d34518ede68f03668cd344f805049a16bc4f189da90533881a17 +LINUX_KERNEL_HASH-4.4.108 = 5a001198625ce9f7b0ef1e4b43e033aea859e1ef3509532412cce8f0375ba51a ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch b/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch index cc19b8ef33..5f46885708 100644 --- a/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch +++ b/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch @@ -1,6 +1,6 @@ --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c -@@ -1187,24 +1187,7 @@ void netlink_detachskb(struct sock *sk, +@@ -1228,24 +1228,7 @@ void netlink_detachskb(struct sock *sk, static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) { diff --git a/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch b/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch index 1d3dcb29ab..4f99418a01 100644 --- a/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch +++ b/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch @@ -246,7 +246,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> #ifdef CONFIG_IGB_HWMON igb_sysfs_exit(adapter); #endif -@@ -3111,6 +3243,12 @@ static int __igb_open(struct net_device +@@ -3113,6 +3245,12 @@ static int __igb_open(struct net_device if (!resuming) pm_runtime_put(&pdev->dev); @@ -259,7 +259,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> /* start the watchdog. */ hw->mac.get_link_status = 1; schedule_work(&adapter->watchdog_task); -@@ -7104,21 +7242,41 @@ void igb_alloc_rx_buffers(struct igb_rin +@@ -7106,21 +7244,41 @@ void igb_alloc_rx_buffers(struct igb_rin static int igb_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) { struct igb_adapter *adapter = netdev_priv(netdev);
Refresh patches. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> --- include/kernel-version.mk | 4 ++-- target/linux/generic/patches-4.4/653-disable_netlink_trim.patch | 2 +- .../204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)