kernel: bump 5.10 to 5.10.200
All patches automatically rebased. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
545807ddff
commit
3e511a7a23
|
@ -1,2 +1,2 @@
|
|||
LINUX_VERSION-5.10 = .199
|
||||
LINUX_KERNEL_HASH-5.10.199 = a0ea77a1f5eeb1387d62e7a8df585ffc53758e4da153d98224ccd833bd2624c1
|
||||
LINUX_VERSION-5.10 = .200
|
||||
LINUX_KERNEL_HASH-5.10.200 = 9d2d961fbf87486e48b0087326ee35cb0af4dec03c770737b098652457205104
|
||||
|
|
|
@ -706,7 +706,7 @@
|
|||
EXPORT_SYMBOL(xfrm_parse_spi);
|
||||
--- a/net/ipv4/tcp_input.c
|
||||
+++ b/net/ipv4/tcp_input.c
|
||||
@@ -4146,14 +4146,16 @@ static bool tcp_parse_aligned_timestamp(
|
||||
@@ -4147,14 +4147,16 @@ static bool tcp_parse_aligned_timestamp(
|
||||
{
|
||||
const __be32 *ptr = (const __be32 *)(th + 1);
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
|
|||
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
|
||||
u32 *data, int in_pm)
|
||||
{
|
||||
@@ -1859,7 +1863,8 @@ static int smsc95xx_rx_fixup(struct usbn
|
||||
@@ -1861,7 +1865,8 @@ static int smsc95xx_rx_fixup(struct usbn
|
||||
if (dev->net->features & NETIF_F_RXCSUM)
|
||||
smsc95xx_rx_csum_offload(skb);
|
||||
skb_trim(skb, skb->len - 4); /* remove fcs */
|
||||
|
@ -35,7 +35,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
|
|||
|
||||
return 1;
|
||||
}
|
||||
@@ -1877,7 +1882,8 @@ static int smsc95xx_rx_fixup(struct usbn
|
||||
@@ -1879,7 +1884,8 @@ static int smsc95xx_rx_fixup(struct usbn
|
||||
if (dev->net->features & NETIF_F_RXCSUM)
|
||||
smsc95xx_rx_csum_offload(ax_skb);
|
||||
skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
|
||||
|
|
|
@ -22,7 +22,7 @@ See: http://forum.kodi.tv/showthread.php?tid=285288
|
|||
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
|
||||
u32 *data, int in_pm)
|
||||
{
|
||||
@@ -918,13 +922,13 @@ static int smsc95xx_reset(struct usbnet
|
||||
@@ -920,13 +924,13 @@ static int smsc95xx_reset(struct usbnet
|
||||
|
||||
if (!turbo_mode) {
|
||||
burst_cap = 0;
|
||||
|
|
|
@ -29,7 +29,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
|
|||
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
|
||||
u32 *data, int in_pm)
|
||||
{
|
||||
@@ -774,6 +779,53 @@ static int smsc95xx_ioctl(struct net_dev
|
||||
@@ -776,6 +781,53 @@ static int smsc95xx_ioctl(struct net_dev
|
||||
return phy_mii_ioctl(netdev->phydev, rq, cmd);
|
||||
}
|
||||
|
||||
|
@ -83,7 +83,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
|
|||
static void smsc95xx_init_mac_address(struct usbnet *dev)
|
||||
{
|
||||
/* maybe the boot loader passed the MAC address in devicetree */
|
||||
@@ -796,6 +848,10 @@ static void smsc95xx_init_mac_address(st
|
||||
@@ -798,6 +850,10 @@ static void smsc95xx_init_mac_address(st
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -254,7 +254,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|||
* clk_get_parent - return the parent of a clk
|
||||
* @clk: the clk whose parent gets returned
|
||||
*
|
||||
@@ -3885,6 +4005,7 @@ __clk_register(struct device *dev, struc
|
||||
@@ -3888,6 +4008,7 @@ __clk_register(struct device *dev, struc
|
||||
goto fail_parents;
|
||||
|
||||
INIT_HLIST_HEAD(&core->clks);
|
||||
|
|
|
@ -98,7 +98,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||
{
|
||||
struct usb_device *udev = interface_to_usbdev(intf);
|
||||
u32 ocp_data = 0;
|
||||
@@ -6688,12 +6665,13 @@ static u8 rtl_get_version(struct usb_int
|
||||
@@ -6689,12 +6666,13 @@ static u8 rtl_get_version(struct usb_int
|
||||
|
||||
return version;
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||
|
||||
if (test_bit(RTL8152_UNPLUG, &tp->flags))
|
||||
return;
|
||||
@@ -6723,7 +6721,7 @@ static int rtl8152_probe(struct usb_inte
|
||||
@@ -6724,7 +6722,7 @@ static int rtl8152_probe(struct usb_inte
|
||||
mutex_init(&tp->control);
|
||||
INIT_DELAYED_WORK(&tp->schedule, rtl_work_func_t);
|
||||
INIT_DELAYED_WORK(&tp->hw_phy_work, rtl_hw_phy_work_func_t);
|
||||
|
|
|
@ -25,7 +25,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||
break;
|
||||
}
|
||||
|
||||
@@ -6856,7 +6856,7 @@ static int rtl8152_probe(struct usb_inte
|
||||
@@ -6857,7 +6857,7 @@ static int rtl8152_probe(struct usb_inte
|
||||
|
||||
ret = register_netdev(netdev);
|
||||
if (ret != 0) {
|
||||
|
|
|
@ -146,7 +146,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||
tp->rx_buf_sz = 32 * 1024;
|
||||
tp->eee_en = true;
|
||||
tp->eee_adv = MDIO_EEE_1000T | MDIO_EEE_100TX;
|
||||
@@ -6858,7 +6867,7 @@ static int rtl8152_probe(struct usb_inte
|
||||
@@ -6859,7 +6868,7 @@ static int rtl8152_probe(struct usb_inte
|
||||
netdev->max_mtu = ETH_DATA_LEN;
|
||||
break;
|
||||
default:
|
||||
|
|
|
@ -2756,7 +2756,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||
default:
|
||||
break;
|
||||
}
|
||||
@@ -6750,6 +8770,27 @@ u8 rtl8152_get_version(struct usb_interf
|
||||
@@ -6751,6 +8771,27 @@ u8 rtl8152_get_version(struct usb_interf
|
||||
case 0x6010:
|
||||
version = RTL_VER_09;
|
||||
break;
|
||||
|
@ -2784,7 +2784,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||
default:
|
||||
version = RTL_VER_UNKNOWN;
|
||||
dev_info(&intf->dev, "Unknown version 0x%04x\n", ocp_data);
|
||||
@@ -6862,12 +8903,29 @@ static int rtl8152_probe(struct usb_inte
|
||||
@@ -6863,12 +8904,29 @@ static int rtl8152_probe(struct usb_inte
|
||||
/* MTU range: 68 - 1500 or 9194 */
|
||||
netdev->min_mtu = ETH_MIN_MTU;
|
||||
switch (tp->version) {
|
||||
|
@ -2817,7 +2817,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||
break;
|
||||
}
|
||||
|
||||
@@ -6883,7 +8941,13 @@ static int rtl8152_probe(struct usb_inte
|
||||
@@ -6884,7 +8942,13 @@ static int rtl8152_probe(struct usb_inte
|
||||
tp->advertising = RTL_ADVERTISED_10_HALF | RTL_ADVERTISED_10_FULL |
|
||||
RTL_ADVERTISED_100_HALF | RTL_ADVERTISED_100_FULL;
|
||||
if (tp->mii.supports_gmii) {
|
||||
|
@ -2832,7 +2832,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||
tp->advertising |= RTL_ADVERTISED_1000_FULL;
|
||||
}
|
||||
tp->duplex = DUPLEX_FULL;
|
||||
@@ -6907,7 +8971,11 @@ static int rtl8152_probe(struct usb_inte
|
||||
@@ -6908,7 +8972,11 @@ static int rtl8152_probe(struct usb_inte
|
||||
set_ethernet_addr(tp);
|
||||
|
||||
usb_set_intfdata(intf, tp);
|
||||
|
@ -2845,7 +2845,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||
|
||||
ret = register_netdev(netdev);
|
||||
if (ret != 0) {
|
||||
@@ -6943,7 +9011,8 @@ static void rtl8152_disconnect(struct us
|
||||
@@ -6948,7 +9016,8 @@ static void rtl8152_disconnect(struct us
|
||||
unregister_netdev(tp->netdev);
|
||||
tasklet_kill(&tp->tx_tl);
|
||||
cancel_delayed_work_sync(&tp->hw_phy_work);
|
||||
|
@ -2855,7 +2855,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||
rtl8152_release_firmware(tp);
|
||||
free_netdev(tp->netdev);
|
||||
}
|
||||
@@ -6963,13 +9032,28 @@ static void rtl8152_disconnect(struct us
|
||||
@@ -6968,13 +9037,28 @@ static void rtl8152_disconnect(struct us
|
||||
.idProduct = (prod), \
|
||||
.bInterfaceClass = USB_CLASS_COMM, \
|
||||
.bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \
|
||||
|
|
|
@ -65,7 +65,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||
static int rtl8152_pre_reset(struct usb_interface *intf)
|
||||
{
|
||||
struct r8152 *tp = usb_get_intfdata(intf);
|
||||
@@ -9374,10 +9407,8 @@ static int rtl8152_probe(struct usb_inte
|
||||
@@ -9375,10 +9408,8 @@ static int rtl8152_probe(struct usb_inte
|
||||
if (version == RTL_VER_UNKNOWN)
|
||||
return -ENODEV;
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
/*
|
||||
* The Mellanox Tavor device gives false positive parity errors. Mark this
|
||||
* device with a broken_parity_status to allow PCI scanning code to "skip"
|
||||
@@ -3335,6 +3336,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
|
||||
@@ -3337,6 +3338,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
|
||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
|
||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
|
||||
|
||||
|
@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
/*
|
||||
* Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.
|
||||
* To work around this, query the size it should be configured to by the
|
||||
@@ -3360,6 +3363,8 @@ static void quirk_intel_ntb(struct pci_d
|
||||
@@ -3362,6 +3365,8 @@ static void quirk_intel_ntb(struct pci_d
|
||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb);
|
||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb);
|
||||
|
||||
|
@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
/*
|
||||
* Some BIOS implementations leave the Intel GPU interrupts enabled, even
|
||||
* though no one is handling them (e.g., if the i915 driver is never
|
||||
@@ -3398,6 +3403,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
|
||||
@@ -3400,6 +3405,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
|
||||
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
|
||||
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
|
||||
|
||||
|
|
|
@ -5492,7 +5492,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
unsigned long type);
|
||||
--- a/include/linux/pci_ids.h
|
||||
+++ b/include/linux/pci_ids.h
|
||||
@@ -1079,6 +1079,12 @@
|
||||
@@ -1080,6 +1080,12 @@
|
||||
#define PCI_DEVICE_ID_SGI_IOC3 0x0003
|
||||
#define PCI_DEVICE_ID_SGI_LITHIUM 0x1002
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
|
|||
#include <linux/platform_data/x86/apple.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/suspend.h>
|
||||
@@ -5812,3 +5813,34 @@ static void nvidia_ion_ahci_fixup(struct
|
||||
@@ -5814,3 +5815,34 @@ static void nvidia_ion_ahci_fixup(struct
|
||||
pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
|
||||
}
|
||||
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);
|
||||
|
|
Loading…
Reference in New Issue