kernel: bump 4.9 to 4.9.137
authorKoen Vandeputte <koen.vandeputte@ncentric.com>
Wed, 14 Nov 2018 12:53:03 +0000 (13:53 +0100)
committerKoen Vandeputte <koen.vandeputte@ncentric.com>
Wed, 14 Nov 2018 15:27:43 +0000 (16:27 +0100)
Refreshed all patches.

Removed upstreamed hunks in:
- 703-phy-support-layerscape.patch

Compile-tested on: ar71xx, layerscape
Runtime-tested on: ar71xx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
46 files changed:
include/kernel-version.mk
target/linux/brcm2708/patches-4.9/031-v4.10-0001-ARM-dts-bcm283x-Define-standard-pinctrl-groups-in-th.patch
target/linux/brcm2708/patches-4.9/031-v4.10-0008-ARM-bcm2835-dts-add-thermal-node-to-device-tree-of-b.patch
target/linux/brcm2708/patches-4.9/032-v4.11-0001-ARM-dts-bcm283x-Add-VEC-node-in-bcm283x.dtsi.patch
target/linux/brcm2708/patches-4.9/950-0001-smsx95xx-fix-crimes-against-truesize.patch
target/linux/brcm2708/patches-4.9/950-0002-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
target/linux/brcm2708/patches-4.9/950-0003-Allow-mac-address-to-be-set-in-smsc95xx.patch
target/linux/brcm2708/patches-4.9/950-0107-i2c-bcm2835-Protect-against-unexpected-TXW-RXR-inter.patch
target/linux/brcm2708/patches-4.9/950-0108-i2c-bcm2835-Use-dev_dbg-logging-on-transfer-errors.patch
target/linux/brcm2708/patches-4.9/950-0109-i2c-bcm2835-Can-t-support-I2C_M_IGNORE_NAK.patch
target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch
target/linux/brcm2708/patches-4.9/950-0111-i2c-bcm2835-Support-i2c-dev-ioctl-I2C_TIMEOUT.patch
target/linux/brcm2708/patches-4.9/950-0112-i2c-bcm2835-Add-support-for-dynamic-clock.patch
target/linux/brcm2708/patches-4.9/950-0113-i2c-bcm2835-Add-debug-support.patch
target/linux/brcm2708/patches-4.9/950-0126-spi-bcm2835-Disable-forced-software-CS.patch
target/linux/brcm2708/patches-4.9/950-0160-ARM-bcm2835-dt-Add-the-DSI-module-nodes-and-clocks.patch
target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch
target/linux/generic/backport-4.9/023-1-smsc95xx-Use-skb_cow_head-to-deal-with-cloned-skbs.patch
target/linux/generic/backport-4.9/061-v4.10-0001-mtd-spi-nor-add-Macronix-mx25u25635f-to-list-of-know.patch
target/linux/generic/backport-4.9/061-v4.10-0002-mtd-spi-nor-fix-spansion-quad-enable.patch
target/linux/generic/backport-4.9/061-v4.10-0003-mtd-spi-nor-fix-flags-for-s25fl128s.patch
target/linux/generic/backport-4.9/061-v4.10-0004-mtd-spi-nor-add-support-for-s25fl208k.patch
target/linux/generic/backport-4.9/061-v4.10-0006-mtd-spi-nor-Add-support-for-N25Q016A.patch
target/linux/generic/backport-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch
target/linux/generic/backport-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch
target/linux/generic/backport-4.9/062-v4.11-0003-mtd-spi-nor-remove-WARN_ONCE-message-in-spi_nor_writ.patch
target/linux/generic/backport-4.9/062-v4.11-0004-mtd-spi-nor-rename-SPINOR_OP_-macros-of-the-4-byte-a.patch
target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch
target/linux/generic/backport-4.9/064-v4.12-mtd-spi-nor-enable-stateless-4b-op-codes-for-mx25u25.patch
target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch
target/linux/generic/pending-4.9/465-m25p80-mx-disable-software-protection.patch
target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
target/linux/generic/pending-4.9/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch
target/linux/generic/pending-4.9/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch
target/linux/generic/pending-4.9/477-mtd-add-spi-nor-add-mx25u3235f.patch
target/linux/generic/pending-4.9/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch
target/linux/generic/pending-4.9/530-jffs2_make_lzma_available.patch
target/linux/generic/pending-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
target/linux/generic/pending-4.9/810-pci_disable_common_quirks.patch
target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch
target/linux/layerscape/patches-4.9/401-mtd-spi-nor-support-layerscape.patch
target/linux/layerscape/patches-4.9/702-pci-support-layerscape.patch
target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch
target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch
target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch

index 9c436e1bc772042c5025bca6ab27d4b37aeaed78..efbcd403251c9b9cc5ae81a76ba1f66ea3ba292b 100644 (file)
@@ -3,11 +3,11 @@
 LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .125
-LINUX_VERSION-4.9 = .135
+LINUX_VERSION-4.9 = .137
 LINUX_VERSION-4.14 = .80
 
 LINUX_KERNEL_HASH-3.18.125 = 708433b360efd8623f7303b721ffb0e7c59cbe8552f1a3f4c0d980a12b4ed90e
-LINUX_KERNEL_HASH-4.9.135 = e023b0bbe9ea7fc56aa57210342dd18ea3e0900ee207226df1523c6d7df154ce
+LINUX_KERNEL_HASH-4.9.137 = 6db2512a9094bf4c830124641d1275635600b052962a7db3556da18914ea2589
 LINUX_KERNEL_HASH-4.14.80 = 9ddc7bc11cbea6475ac5abf18e01a143d7d506bece591e0dcb15c9452d3ed7d2
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
index 6173d943d2e797b7fab38d4e4ebc468c1e808cb4..ac9bd2ba03cd2af142a55fb953be46d612b65d45 100644 (file)
@@ -23,7 +23,7 @@ Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
 
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -132,6 +132,209 @@
+@@ -137,6 +137,209 @@
  
                        interrupt-controller;
                        #interrupt-cells = <2>;
index 4c541a76690df40989dcdf36aef484bb86e8f41f..e561e058e538054c6592dc912d4d05a36cce5efd 100644 (file)
@@ -51,7 +51,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
 +};
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -390,6 +390,13 @@
+@@ -395,6 +395,13 @@
                        interrupts = <2 14>; /* pwa1 */
                };
  
index c0d43870eca2f9c415d9c8ddf4060d642efc1b49..17e9b3e3f5511e4a6c0d6df502303e97b349edb7 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
 
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -476,6 +476,14 @@
+@@ -481,6 +481,14 @@
                        status = "disabled";
                };
  
index a5737e3c835695b9c082fe83b3b10706433a37a6..8916e52741d1670c7c33fb470cba30cf5eaa2f7c 100644 (file)
@@ -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)
  {
-@@ -1951,7 +1955,8 @@ static int smsc95xx_rx_fixup(struct usbn
+@@ -1954,7 +1958,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;
                        }
-@@ -1969,7 +1974,8 @@ static int smsc95xx_rx_fixup(struct usbn
+@@ -1972,7 +1977,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 */
index fc7ac4d8b9b90cb4f1c5d744a9260ee368af1a5d..763b5c7375c0f37d4448fd9a77f120401045673a 100644 (file)
@@ -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)
  {
-@@ -1106,13 +1110,13 @@ static int smsc95xx_reset(struct usbnet
+@@ -1109,13 +1113,13 @@ static int smsc95xx_reset(struct usbnet
  
        if (!turbo_mode) {
                burst_cap = 0;
index 8075dff2f3432628fa76d566ec7dbec0ea80f024..fdf5fc86d7066ebdadd1bd385739a58bc7a059b4 100644 (file)
@@ -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)
  {
-@@ -918,6 +923,53 @@ static int smsc95xx_ioctl(struct net_dev
+@@ -921,6 +926,53 @@ static int smsc95xx_ioctl(struct net_dev
        return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
  }
  
@@ -83,7 +83,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  static void smsc95xx_init_mac_address(struct usbnet *dev)
  {
        const u8 *mac_addr;
-@@ -939,6 +991,10 @@ static void smsc95xx_init_mac_address(st
+@@ -942,6 +994,10 @@ static void smsc95xx_init_mac_address(st
                }
        }
  
index 6646d77944e2ac6969f9506cac8dfe1cc74282a8..0d9b165aba62b272b6ec5ae2a103eb5d7277a398 100644 (file)
@@ -70,7 +70,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
        }
  
        if (val & BCM2835_I2C_S_DONE) {
-@@ -137,21 +141,38 @@ static irqreturn_t bcm2835_i2c_isr(int t
+@@ -139,21 +143,38 @@ static irqreturn_t bcm2835_i2c_isr(int t
                        i2c_dev->msg_err = BCM2835_I2C_S_LEN;
                else
                        i2c_dev->msg_err = 0;
@@ -111,7 +111,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
  }
  
  static int bcm2835_i2c_xfer_msg(struct bcm2835_i2c_dev *i2c_dev,
-@@ -181,8 +202,9 @@ static int bcm2835_i2c_xfer_msg(struct b
+@@ -183,8 +204,9 @@ static int bcm2835_i2c_xfer_msg(struct b
  
        time_left = wait_for_completion_timeout(&i2c_dev->completion,
                                                BCM2835_I2C_TIMEOUT);
index acc2ade0a354c637e4b7676d34e1c9a520b3760c..a3c68467be550cf2a1cf8c656e109f572dd59dc7 100644 (file)
@@ -21,7 +21,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
 
 --- a/drivers/i2c/busses/i2c-bcm2835.c
 +++ b/drivers/i2c/busses/i2c-bcm2835.c
-@@ -216,7 +216,7 @@ static int bcm2835_i2c_xfer_msg(struct b
+@@ -218,7 +218,7 @@ static int bcm2835_i2c_xfer_msg(struct b
            (msg->flags & I2C_M_IGNORE_NAK))
                return 0;
  
index a913c50082b20904243713e164396a696edd6671..65bf08fe8a946a4c865032fd6a29fec936d7955d 100644 (file)
@@ -31,7 +31,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
 
 --- a/drivers/i2c/busses/i2c-bcm2835.c
 +++ b/drivers/i2c/busses/i2c-bcm2835.c
-@@ -212,10 +212,6 @@ static int bcm2835_i2c_xfer_msg(struct b
+@@ -214,10 +214,6 @@ static int bcm2835_i2c_xfer_msg(struct b
        if (likely(!i2c_dev->msg_err))
                return 0;
  
index 0cd5aa4693411dbc678c81a0d943112d674a17f9..9ae16e426ae1bb20873b961c459e9b5b44c5fcf9 100644 (file)
@@ -86,7 +86,7 @@ Acked-by: Eric Anholt <eric@anholt.net>
   * Note about I2C_C_CLEAR on error:
   * The I2C_C_CLEAR on errors will take some time to resolve -- if you were in
   * non-idle state and I2C_C_READ, it sets an abort_rx flag and runs through
-@@ -151,6 +191,12 @@ static irqreturn_t bcm2835_i2c_isr(int t
+@@ -153,6 +193,12 @@ static irqreturn_t bcm2835_i2c_isr(int t
                }
  
                bcm2835_fill_txfifo(i2c_dev);
@@ -99,7 +99,7 @@ Acked-by: Eric Anholt <eric@anholt.net>
                return IRQ_HANDLED;
        }
  
-@@ -175,30 +221,25 @@ complete:
+@@ -177,30 +223,25 @@ complete:
        return IRQ_HANDLED;
  }
  
@@ -144,7 +144,7 @@ Acked-by: Eric Anholt <eric@anholt.net>
  
        time_left = wait_for_completion_timeout(&i2c_dev->completion,
                                                BCM2835_I2C_TIMEOUT);
-@@ -209,31 +250,15 @@ static int bcm2835_i2c_xfer_msg(struct b
+@@ -211,31 +252,15 @@ static int bcm2835_i2c_xfer_msg(struct b
                return -ETIMEDOUT;
        }
  
index 07016d978220bdcff07f5b82a1854ccf23293b61..d939c1d6f8e40e98b58d140dbea34a4dde2ad9e0 100644 (file)
@@ -26,7 +26,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
  struct bcm2835_i2c_dev {
        struct device *dev;
        void __iomem *regs;
-@@ -242,7 +240,7 @@ static int bcm2835_i2c_xfer(struct i2c_a
+@@ -244,7 +242,7 @@ static int bcm2835_i2c_xfer(struct i2c_a
        bcm2835_i2c_start_transfer(i2c_dev);
  
        time_left = wait_for_completion_timeout(&i2c_dev->completion,
index afe2b2297c64fbbbd2bbd56ca4c00cb8177d1c15..d287ae2cb7793c72a5a06e942d3b529453be6d0e 100644 (file)
@@ -56,7 +56,7 @@ Reviewed-by: Martin Sperl <kernel@martin.sperl.org>
  static void bcm2835_fill_txfifo(struct bcm2835_i2c_dev *i2c_dev)
  {
        u32 val;
-@@ -224,7 +249,7 @@ static int bcm2835_i2c_xfer(struct i2c_a
+@@ -226,7 +251,7 @@ static int bcm2835_i2c_xfer(struct i2c_a
  {
        struct bcm2835_i2c_dev *i2c_dev = i2c_get_adapdata(adap);
        unsigned long time_left;
@@ -65,7 +65,7 @@ Reviewed-by: Martin Sperl <kernel@martin.sperl.org>
  
        for (i = 0; i < (num - 1); i++)
                if (msgs[i].flags & I2C_M_RD) {
-@@ -233,6 +258,10 @@ static int bcm2835_i2c_xfer(struct i2c_a
+@@ -235,6 +260,10 @@ static int bcm2835_i2c_xfer(struct i2c_a
                        return -EOPNOTSUPP;
                }
  
@@ -76,7 +76,7 @@ Reviewed-by: Martin Sperl <kernel@martin.sperl.org>
        i2c_dev->curr_msg = msgs;
        i2c_dev->num_msgs = num;
        reinit_completion(&i2c_dev->completion);
-@@ -282,7 +311,6 @@ static int bcm2835_i2c_probe(struct plat
+@@ -284,7 +313,6 @@ static int bcm2835_i2c_probe(struct plat
  {
        struct bcm2835_i2c_dev *i2c_dev;
        struct resource *mem, *irq;
@@ -84,7 +84,7 @@ Reviewed-by: Martin Sperl <kernel@martin.sperl.org>
        int ret;
        struct i2c_adapter *adap;
  
-@@ -306,28 +334,13 @@ static int bcm2835_i2c_probe(struct plat
+@@ -308,28 +336,13 @@ static int bcm2835_i2c_probe(struct plat
        }
  
        ret = of_property_read_u32(pdev->dev.of_node, "clock-frequency",
index f69a48f623c9e820aeb9cc4ae8b185f77eefe744..8e31bcc5e7a948f963ebe3df0bb60c88cd8aaab0 100644 (file)
@@ -151,7 +151,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  
        err = val & (BCM2835_I2C_S_CLKT | BCM2835_I2C_S_ERR);
        if (err) {
-@@ -251,6 +335,13 @@ static int bcm2835_i2c_xfer(struct i2c_a
+@@ -253,6 +337,13 @@ static int bcm2835_i2c_xfer(struct i2c_a
        unsigned long time_left;
        int i, ret;
  
@@ -165,7 +165,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
        for (i = 0; i < (num - 1); i++)
                if (msgs[i].flags & I2C_M_RD) {
                        dev_warn_once(i2c_dev->dev,
-@@ -270,6 +361,10 @@ static int bcm2835_i2c_xfer(struct i2c_a
+@@ -272,6 +363,10 @@ static int bcm2835_i2c_xfer(struct i2c_a
  
        time_left = wait_for_completion_timeout(&i2c_dev->completion,
                                                adap->timeout);
@@ -176,7 +176,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
        if (!time_left) {
                bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C,
                                   BCM2835_I2C_C_CLEAR);
-@@ -280,7 +375,9 @@ static int bcm2835_i2c_xfer(struct i2c_a
+@@ -282,7 +377,9 @@ static int bcm2835_i2c_xfer(struct i2c_a
        if (!i2c_dev->msg_err)
                return num;
  
index 34acd201ba0d56c2a3cc9008acfa3d264f55ba83..1d2bd29ab6b62a7a601411e7e63a9a093943022e 100644 (file)
@@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -366,6 +366,7 @@
+@@ -371,6 +371,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
index 00703579e50a5902b9746c0e080ae6779cb0a98a..285a7b3530314e15fc36550f567f9659525ae771 100644 (file)
@@ -28,7 +28,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
 +};
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -93,10 +93,13 @@
+@@ -98,10 +98,13 @@
                        #clock-cells = <1>;
                        reg = <0x7e101000 0x2000>;
  
@@ -45,7 +45,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
                };
  
                rng@7e104000 {
-@@ -398,6 +401,26 @@
+@@ -403,6 +406,26 @@
                        status = "disabled";
                };
  
@@ -72,7 +72,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
                aux: aux@0x7e215000 {
                        compatible = "brcm,bcm2835-aux";
                        #clock-cells = <1>;
-@@ -457,6 +480,26 @@
+@@ -462,6 +485,26 @@
                        interrupts = <2 1>;
                };
  
index 1886b01cf1c66b0eac3cd0d4182082a6279c2f26..7c36a767c7467fcf0af0ae7bf41c340380ea7371 100644 (file)
@@ -285,7 +285,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
                        if (err)
                                break;
                }
-@@ -1458,7 +1495,8 @@ br_multicast_leave_group(struct net_brid
+@@ -1465,7 +1502,8 @@ br_multicast_leave_group(struct net_brid
                         struct net_bridge_port *port,
                         struct br_ip *group,
                         struct bridge_mcast_other_query *other_query,
@@ -295,7 +295,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
  {
        struct net_bridge_mdb_htable *mdb;
        struct net_bridge_mdb_entry *mp;
-@@ -1482,7 +1520,7 @@ br_multicast_leave_group(struct net_brid
+@@ -1489,7 +1527,7 @@ br_multicast_leave_group(struct net_brid
                for (pp = &mp->ports;
                     (p = mlock_dereference(*pp, br)) != NULL;
                     pp = &p->next) {
@@ -304,7 +304,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
                                continue;
  
                        rcu_assign_pointer(*pp, p->next);
-@@ -1513,7 +1551,7 @@ br_multicast_leave_group(struct net_brid
+@@ -1520,7 +1558,7 @@ br_multicast_leave_group(struct net_brid
                for (p = mlock_dereference(mp->ports, br);
                     p != NULL;
                     p = mlock_dereference(p->next, br)) {
@@ -313,7 +313,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
                                continue;
  
                        if (!hlist_unhashed(&p->mglist) &&
-@@ -1564,7 +1602,8 @@ out:
+@@ -1571,7 +1609,8 @@ out:
  static void br_ip4_multicast_leave_group(struct net_bridge *br,
                                         struct net_bridge_port *port,
                                         __be32 group,
@@ -323,7 +323,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
  {
        struct br_ip br_group;
        struct bridge_mcast_own_query *own_query;
-@@ -1579,14 +1618,15 @@ static void br_ip4_multicast_leave_group
+@@ -1586,14 +1625,15 @@ static void br_ip4_multicast_leave_group
        br_group.vid = vid;
  
        br_multicast_leave_group(br, port, &br_group, &br->ip4_other_query,
@@ -341,7 +341,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
  {
        struct br_ip br_group;
        struct bridge_mcast_own_query *own_query;
-@@ -1601,7 +1641,7 @@ static void br_ip6_multicast_leave_group
+@@ -1608,7 +1648,7 @@ static void br_ip6_multicast_leave_group
        br_group.vid = vid;
  
        br_multicast_leave_group(br, port, &br_group, &br->ip6_other_query,
@@ -350,7 +350,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
  }
  #endif
  
-@@ -1644,6 +1684,7 @@ static int br_multicast_ipv4_rcv(struct
+@@ -1651,6 +1691,7 @@ static int br_multicast_ipv4_rcv(struct
                                 u16 vid)
  {
        struct sk_buff *skb_trimmed = NULL;
@@ -358,7 +358,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
        struct igmphdr *ih;
        int err;
  
-@@ -1659,13 +1700,14 @@ static int br_multicast_ipv4_rcv(struct
+@@ -1666,13 +1707,14 @@ static int br_multicast_ipv4_rcv(struct
        }
  
        ih = igmp_hdr(skb);
@@ -374,7 +374,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
                break;
        case IGMPV3_HOST_MEMBERSHIP_REPORT:
                err = br_ip4_multicast_igmp3_report(br, port, skb_trimmed, vid);
-@@ -1674,7 +1716,7 @@ static int br_multicast_ipv4_rcv(struct
+@@ -1681,7 +1723,7 @@ static int br_multicast_ipv4_rcv(struct
                err = br_ip4_multicast_query(br, port, skb_trimmed, vid);
                break;
        case IGMP_HOST_LEAVE_MESSAGE:
@@ -383,7 +383,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
                break;
        }
  
-@@ -1694,6 +1736,7 @@ static int br_multicast_ipv6_rcv(struct
+@@ -1701,6 +1743,7 @@ static int br_multicast_ipv6_rcv(struct
                                 u16 vid)
  {
        struct sk_buff *skb_trimmed = NULL;
@@ -391,7 +391,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
        struct mld_msg *mld;
        int err;
  
-@@ -1713,8 +1756,10 @@ static int br_multicast_ipv6_rcv(struct
+@@ -1720,8 +1763,10 @@ static int br_multicast_ipv6_rcv(struct
  
        switch (mld->mld_type) {
        case ICMPV6_MGM_REPORT:
@@ -403,7 +403,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
                break;
        case ICMPV6_MLD2_REPORT:
                err = br_ip6_multicast_mld2_report(br, port, skb_trimmed, vid);
-@@ -1723,7 +1768,8 @@ static int br_multicast_ipv6_rcv(struct
+@@ -1730,7 +1775,8 @@ static int br_multicast_ipv6_rcv(struct
                err = br_ip6_multicast_query(br, port, skb_trimmed, vid);
                break;
        case ICMPV6_MGM_REDUCTION:
index cfc9abb3b7f8f3eaa0ff383190600fab6a05fb75..c665900dc4d44d7f124cf09e81f71f39ba90b5dd 100644 (file)
@@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
-@@ -2001,13 +2001,13 @@ static struct sk_buff *smsc95xx_tx_fixup
+@@ -2004,13 +2004,13 @@ static struct sk_buff *smsc95xx_tx_fixup
        /* We do not advertise SG, so skbs should be already linearized */
        BUG_ON(skb_shinfo(skb)->nr_frags);
  
index 54f950036b26f4caf31a8e46617d1262e1376c14..a70d827782fe5709e6ccfe30769edc5463e874d4 100644 (file)
@@ -12,7 +12,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -872,6 +872,7 @@ static const struct flash_info spi_nor_i
+@@ -878,6 +878,7 @@ static const struct flash_info spi_nor_i
        { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
        { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
        { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
index c5e29c7c1f2d314621f9759d3e4586d847d62a17..e4563ebeb6df80a5bf2300ffedea08e61e803bda 100644 (file)
@@ -26,7 +26,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1263,6 +1263,13 @@ static int spansion_quad_enable(struct s
+@@ -1269,6 +1269,13 @@ static int spansion_quad_enable(struct s
                return ret;
        }
  
index 9c4e10d022f30ec9ea939796d687045e27a647e7..76c5d2d9712ed30e19bd57ab3dac0dc5a520710a 100644 (file)
@@ -17,7 +17,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -906,7 +906,7 @@ static const struct flash_info spi_nor_i
+@@ -912,7 +912,7 @@ static const struct flash_info spi_nor_i
        { "s70fl01gs",  INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) },
        { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024,  64, 0) },
        { "s25sl12801", INFO(0x012018, 0x0301,  64 * 1024, 256, 0) },
index 955e5bb2d4fd7502406ac3737fb5b59e57b00b12..004c1c515191ea2b3b010a1885672c3c8f9ccbc8 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -922,6 +922,7 @@ static const struct flash_info spi_nor_i
+@@ -928,6 +928,7 @@ static const struct flash_info spi_nor_i
        { "s25fl132k",  INFO(0x014016,      0,  64 * 1024,  64, SECT_4K) },
        { "s25fl164k",  INFO(0x014017,      0,  64 * 1024, 128, SECT_4K) },
        { "s25fl204k",  INFO(0x014013,      0,  64 * 1024,   8, SECT_4K | SPI_NOR_DUAL_READ) },
index b4e94543e5c19d7ee21ff793aef068a29873d753..8df61f6ed2c0626797246e9e6cff9febd2dcfd51 100644 (file)
@@ -19,7 +19,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -879,6 +879,7 @@ static const struct flash_info spi_nor_i
+@@ -885,6 +885,7 @@ static const struct flash_info spi_nor_i
        { "mx66l1g55g",  INFO(0xc2261b, 0, 64 * 1024, 2048, SPI_NOR_QUAD_READ) },
  
        /* Micron */
index 87b83cc5dd5fd39481f3bdc4c44dc5b60dbe13b8..a17498492189fd2167cb549ffbff00e4bc4f8f0f 100644 (file)
@@ -140,7 +140,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
  /* NOTE: double check command sets and memory organization when you add
   * more nor chips.  This current list focusses on newer chips, which
   * have been converging on command sets which including JEDEC ID.
-@@ -1014,6 +1073,13 @@ static const struct flash_info spi_nor_i
+@@ -1020,6 +1079,13 @@ static const struct flash_info spi_nor_i
        { "cat25c09", CAT25_INFO( 128, 8, 32, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
        { "cat25c17", CAT25_INFO( 256, 8, 32, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
        { "cat25128", CAT25_INFO(2048, 8, 64, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
@@ -154,7 +154,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
        { },
  };
  
-@@ -1054,7 +1120,12 @@ static int spi_nor_read(struct mtd_info
+@@ -1060,7 +1126,12 @@ static int spi_nor_read(struct mtd_info
                return ret;
  
        while (len) {
@@ -168,7 +168,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
                if (ret == 0) {
                        /* We shouldn't see 0-length reads */
                        ret = -EIO;
-@@ -1175,8 +1246,23 @@ static int spi_nor_write(struct mtd_info
+@@ -1181,8 +1252,23 @@ static int spi_nor_write(struct mtd_info
  
        for (i = 0; i < len; ) {
                ssize_t written;
@@ -193,7 +193,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
                WARN_ONCE(page_offset,
                          "Writing at offset %zu into a NOR page. Writing partial pages may decrease reliability and increase wear of NOR flash.",
                          page_offset);
-@@ -1184,8 +1270,11 @@ static int spi_nor_write(struct mtd_info
+@@ -1190,8 +1276,11 @@ static int spi_nor_write(struct mtd_info
                page_remain = min_t(size_t,
                                    nor->page_size - page_offset, len - i);
  
@@ -206,7 +206,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
                if (ret < 0)
                        goto write_err;
                written = ret;
-@@ -1319,6 +1408,47 @@ static int spi_nor_check(struct spi_nor
+@@ -1325,6 +1414,47 @@ static int spi_nor_check(struct spi_nor
        return 0;
  }
  
@@ -254,7 +254,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
  int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
  {
        const struct flash_info *info = NULL;
-@@ -1367,6 +1497,14 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1373,6 +1503,14 @@ int spi_nor_scan(struct spi_nor *nor, co
        mutex_init(&nor->lock);
  
        /*
@@ -269,7 +269,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
         * Atmel, SST, Intel/Numonyx, and others serial NOR tend to power up
         * with the software protection bits set
         */
-@@ -1524,6 +1662,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1530,6 +1668,12 @@ int spi_nor_scan(struct spi_nor *nor, co
  
        nor->read_dummy = spi_nor_read_dummy_cycles(nor);
  
index bdd5e344d78036bce8eb2f9aff354ef838d74371..ec469d405b9c63190161e9bd3e05d7908485a619 100644 (file)
@@ -16,7 +16,7 @@ Acked-by: Marek Vasut <marek.vasut@gmail.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1305,6 +1305,9 @@ static int macronix_quad_enable(struct s
+@@ -1311,6 +1311,9 @@ static int macronix_quad_enable(struct s
        val = read_sr(nor);
        if (val < 0)
                return val;
index 731ef21bb8f001a97fa554d2ea830b6e07ace97e..790b557611d4b322e33003f07d97a86f0772d343 100644 (file)
@@ -21,7 +21,7 @@ Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1263,9 +1263,6 @@ static int spi_nor_write(struct mtd_info
+@@ -1269,9 +1269,6 @@ static int spi_nor_write(struct mtd_info
  
                        page_offset = do_div(aux, nor->page_size);
                }
index d436789eb00a3d1e50976de69d9274eba6228369..34562e197c0ad574ef5bf1f3965a0ef6ff24209c 100644 (file)
@@ -95,7 +95,7 @@ Acked-by: Marek Vasut <marek.vasut@gmail.com>
  static struct seq_rw_config stfsm_s25fl_write4_configs[] = {
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1632,16 +1632,16 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1638,16 +1638,16 @@ int spi_nor_scan(struct spi_nor *nor, co
                        /* Dedicated 4-byte command set */
                        switch (nor->flash_read) {
                        case SPI_NOR_QUAD:
index dc05fe31bb0249fc0a8134cae93aaabac3f84d15..1d507c192056e84ca8ab8ced9d16733b311a9c24 100644 (file)
@@ -116,7 +116,7 @@ Acked-by: Marek Vasut <marek.vasut@gmail.com>
  /* Enable/disable 4-byte addressing mode. */
  static inline int set_4byte(struct spi_nor *nor, const struct flash_info *info,
                            int enable)
-@@ -1628,27 +1704,10 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1634,27 +1710,10 @@ int spi_nor_scan(struct spi_nor *nor, co
        else if (mtd->size > 0x1000000) {
                /* enable 4-byte addressing if the device exceeds 16MiB */
                nor->addr_width = 4;
index 339591500f222506e68ea0795a1cea673614a934..d1544b1d3609cbf1fd42c1e0a85f707d30d54e01 100644 (file)
@@ -18,7 +18,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1017,7 +1017,7 @@ static const struct flash_info spi_nor_i
+@@ -1023,7 +1023,7 @@ static const struct flash_info spi_nor_i
        { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
        { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
        { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
index dffad0216f2b9b3128b101a5f9846abc2c72771a..4e7bc93294315d635014e3312c51886397bd4db5 100644 (file)
@@ -1040,7 +1040,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                writel(irq->mask, adpt->base + EMAC_INT_MASK);
 --- a/drivers/net/ethernet/realtek/r8169.c
 +++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -7578,7 +7578,7 @@ static int rtl8169_poll(struct napi_stru
+@@ -7576,7 +7576,7 @@ static int rtl8169_poll(struct napi_stru
        }
  
        if (work_done < budget) {
@@ -1095,7 +1095,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                dma_intr_ena = smsc9420_reg_read(pd, DMAC_INTR_ENA);
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -2705,7 +2705,7 @@ static int stmmac_poll(struct napi_struc
+@@ -2706,7 +2706,7 @@ static int stmmac_poll(struct napi_struc
  
        work_done = stmmac_rx(priv, budget);
        if (work_done < budget) {
index b91bfb7f61511d8324f36a43de4bf07ddfbacb92..136fdf48d30fd0965cc08aef0c9a0839124df0ee 100644 (file)
@@ -39,7 +39,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        opt->ops.opt_nflen = 8;
  }
  
-@@ -1187,7 +1187,7 @@ route_lookup:
+@@ -1199,7 +1199,7 @@ route_lookup:
  
        if (encap_limit >= 0) {
                init_tel_txopt(&opt, encap_limit);
@@ -47,4 +47,4 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 +              ipv6_push_frag_opts(skb, &opt.ops, &proto);
        }
  
-       /* Calculate max headroom for all the headers and adjust
+       skb_push(skb, sizeof(struct ipv6hdr));
index 9b90b9bc7e2001c3c721a3037b1c59226cb6c1c4..27adddeb301909f09beb86986ee8d91a4573af76 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1595,6 +1595,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1601,6 +1601,7 @@ int spi_nor_scan(struct spi_nor *nor, co
  
        if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
            JEDEC_MFR(info) == SNOR_MFR_INTEL ||
index e032b08f4d55ced56b2436368b79e61aba9a49e8..e1681d61dd64458b2c8177e6c864bd15f447bdcc 100644 (file)
@@ -17,7 +17,7 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1597,6 +1597,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1603,6 +1603,7 @@ int spi_nor_scan(struct spi_nor *nor, co
            JEDEC_MFR(info) == SNOR_MFR_INTEL ||
            JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
            JEDEC_MFR(info) == SNOR_MFR_SST ||
@@ -25,7 +25,7 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
            info->flags & SPI_NOR_HAS_LOCK) {
                write_enable(nor);
                write_sr(nor, 0);
-@@ -1615,7 +1616,8 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1621,7 +1622,8 @@ int spi_nor_scan(struct spi_nor *nor, co
  
        /* NOR protection support for STmicro/Micron chips and similar */
        if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
index e1c1de360293790e212abde6391b279106721580..aaaf7ed793f860b44d70ec4ce7034e945a0cda3b 100644 (file)
@@ -39,7 +39,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        depends on ARCH_AT91 || (ARM && COMPILE_TEST)
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1642,10 +1642,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1648,10 +1648,12 @@ int spi_nor_scan(struct spi_nor *nor, co
  
  #ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
        /* prefer "small sector" erase if possible */
index 87f0325fbc0a7eb4b2bf33326e7b884eaa8c1380..d54ee4f25ae779179eb097addd9ed0c17fa4ea91 100644 (file)
@@ -20,7 +20,7 @@ Changes in v2:
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1146,6 +1146,11 @@ static const struct flash_info spi_nor_i
+@@ -1152,6 +1152,11 @@ static const struct flash_info spi_nor_i
                        SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
                        SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
        },
index 9f044027d95e7a9225abd4ad7dceff1ab8631a27..62f6314e93b4305bae6972a5445a358ea5d86c59 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: André Valentin <avalentin@marcant.net>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1014,6 +1014,7 @@ static const struct flash_info spi_nor_i
+@@ -1020,6 +1020,7 @@ static const struct flash_info spi_nor_i
        { "mx25l3205d",  INFO(0xc22016, 0, 64 * 1024,  64, SECT_4K) },
        { "mx25l3255e",  INFO(0xc29e16, 0, 64 * 1024,  64, SECT_4K) },
        { "mx25l6405d",  INFO(0xc22017, 0, 64 * 1024, 128, SECT_4K) },
index 39e78b23431908ddce65cae02ac9db32dcb2b20d..011f4b4458486b629b00ac4a8f3a3f402d3746bd 100644 (file)
@@ -17,7 +17,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1171,6 +1171,10 @@ static const struct flash_info spi_nor_i
+@@ -1177,6 +1177,10 @@ static const struct flash_info spi_nor_i
        { "3S400AN", S3AN_INFO(0x1f2400, 256, 264) },
        { "3S700AN", S3AN_INFO(0x1f2500, 512, 264) },
        { "3S1400AN", S3AN_INFO(0x1f2600, 512, 528) },
index 8f68fed50cbbd14421911c7f7829a1e6b00b3517..f5cd6005a4c071dd559c0e8192ac4d4ef31ef0de 100644 (file)
@@ -244,7 +244,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
 +}
 --- a/fs/jffs2/super.c
 +++ b/fs/jffs2/super.c
-@@ -372,14 +372,41 @@ static int __init init_jffs2_fs(void)
+@@ -370,14 +370,41 @@ static int __init init_jffs2_fs(void)
        BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
        BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
  
index 4757e81ea1141df3d8b6d4251e76e90e56619a10..c8deaba842bd4464e54d4042fd69418e159c9059 100644 (file)
@@ -153,7 +153,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
                case RTN_THROW:
                case RTN_UNREACHABLE:
                default:
-@@ -2610,6 +2632,17 @@ static int ip6_pkt_prohibit_out(struct n
+@@ -2613,6 +2635,17 @@ static int ip6_pkt_prohibit_out(struct n
        return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
  }
  
@@ -171,7 +171,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  /*
   *    Allocate a dst for local (unicast / anycast) address.
   */
-@@ -2847,7 +2880,8 @@ static int rtm_to_fib6_config(struct sk_
+@@ -2850,7 +2883,8 @@ static int rtm_to_fib6_config(struct sk_
        if (rtm->rtm_type == RTN_UNREACHABLE ||
            rtm->rtm_type == RTN_BLACKHOLE ||
            rtm->rtm_type == RTN_PROHIBIT ||
@@ -181,7 +181,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
                cfg->fc_flags |= RTF_REJECT;
  
        if (rtm->rtm_type == RTN_LOCAL)
-@@ -3219,6 +3253,9 @@ static int rt6_fill_node(struct net *net
+@@ -3222,6 +3256,9 @@ static int rt6_fill_node(struct net *net
                case -EACCES:
                        rtm->rtm_type = RTN_PROHIBIT;
                        break;
@@ -191,7 +191,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
                case -EAGAIN:
                        rtm->rtm_type = RTN_THROW;
                        break;
-@@ -3495,6 +3532,8 @@ static int ip6_route_dev_notify(struct n
+@@ -3490,6 +3527,8 @@ static int ip6_route_dev_notify(struct n
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
                net->ipv6.ip6_prohibit_entry->dst.dev = dev;
                net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -200,7 +200,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
                net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
                net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
  #endif
-@@ -3506,6 +3545,7 @@ static int ip6_route_dev_notify(struct n
+@@ -3501,6 +3540,7 @@ static int ip6_route_dev_notify(struct n
                in6_dev_put(net->ipv6.ip6_null_entry->rt6i_idev);
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
                in6_dev_put(net->ipv6.ip6_prohibit_entry->rt6i_idev);
@@ -208,7 +208,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
                in6_dev_put(net->ipv6.ip6_blk_hole_entry->rt6i_idev);
  #endif
        }
-@@ -3721,6 +3761,17 @@ static int __net_init ip6_route_net_init
+@@ -3716,6 +3756,17 @@ static int __net_init ip6_route_net_init
        net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
        dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
                         ip6_template_metrics, true);
@@ -226,7 +226,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  #endif
  
        net->ipv6.sysctl.flush_delay = 0;
-@@ -3739,6 +3790,8 @@ out:
+@@ -3734,6 +3785,8 @@ out:
        return ret;
  
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  out_ip6_prohibit_entry:
        kfree(net->ipv6.ip6_prohibit_entry);
  out_ip6_null_entry:
-@@ -3756,6 +3809,7 @@ static void __net_exit ip6_route_net_exi
+@@ -3751,6 +3804,7 @@ static void __net_exit ip6_route_net_exi
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
        kfree(net->ipv6.ip6_prohibit_entry);
        kfree(net->ipv6.ip6_blk_hole_entry);
@@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  #endif
        dst_entries_destroy(&net->ipv6.ip6_dst_ops);
  }
-@@ -3829,6 +3883,9 @@ void __init ip6_route_init_special_entri
+@@ -3824,6 +3878,9 @@ void __init ip6_route_init_special_entri
        init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
        init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
        init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
index 464e035f5fd9a2441783dcaf411abf9d0e1b8dfa..f730e83878ee502af7b5dd6e4a6ea6397e4792bd 100644 (file)
@@ -49,7 +49,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 (f.e. i915 driver is never loaded).
-@@ -3128,6 +3132,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+@@ -3132,6 +3136,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);
  
index d0570a27194cb0ed04813aff6a6d17d17a76d03f..28a4d111a5941347d58fdf7581d273def5ea4708 100644 (file)
@@ -1160,7 +1160,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
 +#endif
 --- a/kernel/irq/manage.c
 +++ b/kernel/irq/manage.c
-@@ -1387,6 +1387,7 @@ __setup_irq(unsigned int irq, struct irq
+@@ -1391,6 +1391,7 @@ __setup_irq(unsigned int irq, struct irq
                wake_up_process(new->secondary->thread);
  
        register_irq_proc(irq, desc);
@@ -1370,7 +1370,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        &queue_tx_maxrate.attr,
 --- a/net/core/rtnetlink.c
 +++ b/net/core/rtnetlink.c
-@@ -3696,7 +3696,7 @@ static int rtnl_get_offload_stats(struct
+@@ -3706,7 +3706,7 @@ static int rtnl_get_offload_stats(struct
                if (!size)
                        continue;
  
@@ -1379,7 +1379,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                        continue;
  
                attr = nla_reserve_64bit(skb, attr_id, size,
-@@ -3737,7 +3737,7 @@ static int rtnl_get_offload_stats_size(c
+@@ -3747,7 +3747,7 @@ static int rtnl_get_offload_stats_size(c
  
        for (attr_id = IFLA_OFFLOAD_XSTATS_FIRST;
             attr_id <= IFLA_OFFLOAD_XSTATS_MAX; attr_id++) {
index 4c07f2f28378fa2833a3cc96d7164d7ecf19157c..89139d93b8eb08ca7acaa39d400855a261d86ec8 100644 (file)
@@ -715,7 +715,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  
        /* Everspin */
        { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
-@@ -1015,12 +1029,15 @@ static const struct flash_info spi_nor_i
+@@ -1021,12 +1035,15 @@ static const struct flash_info spi_nor_i
        { "mx25l3205d",  INFO(0xc22016, 0, 64 * 1024,  64, SECT_4K) },
        { "mx25l3255e",  INFO(0xc29e16, 0, 64 * 1024,  64, SECT_4K) },
        { "mx25l6405d",  INFO(0xc22017, 0, 64 * 1024, 128, SECT_4K) },
@@ -732,7 +732,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
        { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_QUAD_READ) },
        { "mx66l1g55g",  INFO(0xc2261b, 0, 64 * 1024, 2048, SPI_NOR_QUAD_READ) },
-@@ -1034,10 +1051,11 @@ static const struct flash_info spi_nor_i
+@@ -1040,10 +1057,11 @@ static const struct flash_info spi_nor_i
        { "n25q128a11",  INFO(0x20bb18, 0, 64 * 1024,  256, SECT_4K | SPI_NOR_QUAD_READ) },
        { "n25q128a13",  INFO(0x20ba18, 0, 64 * 1024,  256, SECT_4K | SPI_NOR_QUAD_READ) },
        { "n25q256a",    INFO(0x20ba19, 0, 64 * 1024,  512, SECT_4K | SPI_NOR_QUAD_READ) },
@@ -746,7 +746,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  
        /* PMC */
        { "pm25lv512",   INFO(0,        0, 32 * 1024,    2, SECT_4K_PMC) },
-@@ -1055,8 +1073,11 @@ static const struct flash_info spi_nor_i
+@@ -1061,8 +1079,11 @@ static const struct flash_info spi_nor_i
        { "s70fl01gs",  INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) },
        { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024,  64, 0) },
        { "s25sl12801", INFO(0x012018, 0x0301,  64 * 1024, 256, 0) },
@@ -759,7 +759,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        { "s25fl129p1", INFO(0x012018, 0x4d01,  64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
        { "s25sl004a",  INFO(0x010212,      0,  64 * 1024,   8, 0) },
        { "s25sl008a",  INFO(0x010213,      0,  64 * 1024,  16, 0) },
-@@ -1130,7 +1151,15 @@ static const struct flash_info spi_nor_i
+@@ -1136,7 +1157,15 @@ static const struct flash_info spi_nor_i
        { "w25x40", INFO(0xef3013, 0, 64 * 1024,  8,  SECT_4K) },
        { "w25x80", INFO(0xef3014, 0, 64 * 1024,  16, SECT_4K) },
        { "w25x16", INFO(0xef3015, 0, 64 * 1024,  32, SECT_4K) },
@@ -775,7 +775,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        { "w25q32", INFO(0xef4016, 0, 64 * 1024,  64, SECT_4K) },
        {
                "w25q32dw", INFO(0xef6016, 0, 64 * 1024,  64,
-@@ -1202,6 +1231,53 @@ static const struct flash_info *spi_nor_
+@@ -1208,6 +1237,53 @@ static const struct flash_info *spi_nor_
                id[0], id[1], id[2]);
        return ERR_PTR(-ENODEV);
  }
@@ -829,7 +829,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  
  static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len,
                        size_t *retlen, u_char *buf)
-@@ -1421,7 +1497,7 @@ static int macronix_quad_enable(struct s
+@@ -1427,7 +1503,7 @@ static int macronix_quad_enable(struct s
   * Write status Register and configuration register with 2 bytes
   * The first byte will be written to the status register, while the
   * second byte will be written to the configuration register.
@@ -838,7 +838,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
   */
  static int write_sr_cr(struct spi_nor *nor, u16 val)
  {
-@@ -1469,6 +1545,24 @@ static int spansion_quad_enable(struct s
+@@ -1475,6 +1551,24 @@ static int spansion_quad_enable(struct s
        return 0;
  }
  
@@ -863,7 +863,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  static int set_quad_mode(struct spi_nor *nor, const struct flash_info *info)
  {
        int status;
-@@ -1615,9 +1709,25 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1621,9 +1715,25 @@ int spi_nor_scan(struct spi_nor *nor, co
                write_sr(nor, 0);
                spi_nor_wait_till_ready(nor);
        }
@@ -889,7 +889,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        mtd->priv = nor;
        mtd->type = MTD_NORFLASH;
        mtd->writesize = 1;
-@@ -1651,6 +1761,8 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1657,6 +1767,8 @@ int spi_nor_scan(struct spi_nor *nor, co
                nor->flags |= SNOR_F_USE_FSR;
        if (info->flags & SPI_NOR_HAS_TB)
                nor->flags |= SNOR_F_HAS_SR_TB;
@@ -898,7 +898,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  
  #ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
        /* prefer "small sector" erase if possible */
-@@ -1690,9 +1802,15 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1696,9 +1808,15 @@ int spi_nor_scan(struct spi_nor *nor, co
        /* Some devices cannot do fast-read, no matter what DT tells us */
        if (info->flags & SPI_NOR_NO_FR)
                nor->flash_read = SPI_NOR_NORMAL;
@@ -917,7 +917,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                ret = set_quad_mode(nor, info);
                if (ret) {
                        dev_err(dev, "quad mode not supported\n");
-@@ -1705,6 +1823,9 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1711,6 +1829,9 @@ int spi_nor_scan(struct spi_nor *nor, co
  
        /* Default commands */
        switch (nor->flash_read) {
index eb023912058361fbb8c4d795cfbe1dfe3b2c8827..6f34cfe58e4a3b5190009efa55a2dc08515efbde 100644 (file)
@@ -2060,7 +2060,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        }
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -3329,6 +3329,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_A
+@@ -3333,6 +3333,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_A
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x003c, quirk_no_bus_reset);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0033, quirk_no_bus_reset);
  
@@ -2074,7 +2074,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  static void quirk_no_pm_reset(struct pci_dev *dev)
  {
        /*
-@@ -4673,3 +4680,11 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IN
+@@ -4677,3 +4684,11 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IN
  DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2031, quirk_no_aersid);
  DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2032, quirk_no_aersid);
  DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2033, quirk_no_aersid);
index 4327a266486b58dfe831468214ea81c86eff35c4..4124bab4adf7b85b48b307f6bc43f09dc56dad5b 100644 (file)
@@ -1605,17 +1605,6 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
 +MODULE_DESCRIPTION("Freescale Backplane driver");
 +MODULE_AUTHOR("Shaohui Xie <Shaohui.Xie@freescale.com>");
 +MODULE_LICENSE("GPL v2");
---- a/drivers/net/phy/marvell.c
-+++ b/drivers/net/phy/marvell.c
-@@ -1610,7 +1610,7 @@ static struct phy_driver marvell_drivers
-               .flags = PHY_HAS_INTERRUPT,
-               .probe = marvell_probe,
-               .config_init = &m88e1145_config_init,
--              .config_aneg = &marvell_config_aneg,
-+              .config_aneg = &m88e1101_config_aneg,
-               .read_status = &genphy_read_status,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
 @@ -591,7 +591,7 @@ int phy_mii_ioctl(struct phy_device *phy
index 56a3dc01c48a91dac3a7db1d563bc930bbb85957..714fba3a7e6b14b7e7a2fbfdcdba3f7088ec62dd 100644 (file)
@@ -782,7 +782,7 @@ Singed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  };
  
  struct tcrypt_result {
-@@ -1333,6 +1333,10 @@ static int do_test(const char *alg, u32
+@@ -1336,6 +1336,10 @@ static int do_test(const char *alg, u32
                ret += tcrypt_test("hmac(sha3-512)");
                break;
  
@@ -793,7 +793,7 @@ Singed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        case 150:
                ret += tcrypt_test("ansi_cprng");
                break;
-@@ -1394,6 +1398,9 @@ static int do_test(const char *alg, u32
+@@ -1397,6 +1401,9 @@ static int do_test(const char *alg, u32
        case 190:
                ret += tcrypt_test("authenc(hmac(sha512),cbc(des3_ede))");
                break;
@@ -803,7 +803,7 @@ Singed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        case 200:
                test_cipher_speed("ecb(aes)", ENCRYPT, sec, NULL, 0,
                                speed_template_16_24_32);
-@@ -1408,9 +1415,9 @@ static int do_test(const char *alg, u32
+@@ -1411,9 +1418,9 @@ static int do_test(const char *alg, u32
                test_cipher_speed("lrw(aes)", DECRYPT, sec, NULL, 0,
                                speed_template_32_40_48);
                test_cipher_speed("xts(aes)", ENCRYPT, sec, NULL, 0,
@@ -815,7 +815,7 @@ Singed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                test_cipher_speed("cts(cbc(aes))", ENCRYPT, sec, NULL, 0,
                                speed_template_16_24_32);
                test_cipher_speed("cts(cbc(aes))", DECRYPT, sec, NULL, 0,
-@@ -1841,9 +1848,9 @@ static int do_test(const char *alg, u32
+@@ -1844,9 +1851,9 @@ static int do_test(const char *alg, u32
                test_acipher_speed("lrw(aes)", DECRYPT, sec, NULL, 0,
                                   speed_template_32_40_48);
                test_acipher_speed("xts(aes)", ENCRYPT, sec, NULL, 0,
@@ -28208,8 +28208,8 @@ Singed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  extern bool caam_little_end;
 +extern bool caam_imx;
  
- #define caam_to_cpu(len)                              \
- static inline u##len caam##len ## _to_cpu(u##len val) \
+ #define caam_to_cpu(len)                                              \
+ static inline u##len caam##len ## _to_cpu(u##len val)                 \
 @@ -154,13 +156,10 @@ static inline u64 rd_reg64(void __iomem
  #else /* CONFIG_64BIT */
  static inline void wr_reg64(void __iomem *reg, u64 data)
index b170fa93a2d2fbd725b269a64369918e964d07a3..cad2b41aa79947d88ff14ec9f2a9f6d0ae740a30 100644 (file)
@@ -88,7 +88,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                        pkt_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK;
                        if (pkt_len < ETH_ZLEN)
                                break;
-@@ -4510,6 +4515,7 @@ static struct usb_device_id rtl8152_tabl
+@@ -4513,6 +4518,7 @@ static struct usb_device_id rtl8152_tabl
        {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x304f)},
        {REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041)},
        {REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA,  0x09ff)},