-LINUX_VERSION-6.1 = .52
-LINUX_KERNEL_HASH-6.1.52 = 567737990dbc9265966a0786392821a9fa559fd346494fd1eff050dbeb383a52
+LINUX_VERSION-6.1 = .53
+LINUX_KERNEL_HASH-6.1.53 = 5f57e0a04810d24f2b1a8fc95451241f80530e678717eda0f45104c6dc78ed7e
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
-@@ -272,7 +272,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
+@@ -274,7 +274,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
# args (to if_changed): 1 = (this rule), 2 = platform, 3 = dts 4=dtb 5=initrd
quiet_cmd_wrap = WRAP $@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -258,6 +258,8 @@ config ATH79
+@@ -257,6 +257,8 @@ config ATH79
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_MIPS16
select SYS_SUPPORTS_ZBOOT_UART_PROM
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
-@@ -2941,12 +2941,19 @@ static void spi_nor_set_mtd_info(struct
+@@ -2942,12 +2942,19 @@ static void spi_nor_set_mtd_info(struct
{
struct mtd_info *mtd = &nor->mtd;
struct device *dev = nor->dev;
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -4166,14 +4166,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4165,14 +4165,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);
}
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -5580,7 +5580,7 @@ static void port_event(struct usb_hub *h
+@@ -5636,7 +5636,7 @@ static void port_event(struct usb_hub *h
port_dev->over_current_count++;
port_over_current_notify(port_dev);
USB_PORT_FEAT_C_OVER_CURRENT);
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
-@@ -2140,6 +2140,85 @@ free_interfaces:
+@@ -2135,6 +2135,85 @@ free_interfaces:
if (cp->string == NULL &&
!(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
cp->string = usb_cache_string(dev, cp->desc.iConfiguration);
select DMA_ENGINE
select DMA_VIRTUAL_CHANNELS
-@@ -703,6 +703,10 @@ config UNIPHIER_XDMAC
+@@ -705,6 +705,10 @@ config UNIPHIER_XDMAC
UniPhier platform. This DMA controller can transfer data from
memory to memory, memory to peripheral and peripheral to memory.
config SND_SOC_RT5631
tristate "Realtek ALC5631/RT5631 CODEC"
depends on I2C
-@@ -1622,6 +1637,9 @@ config SND_SOC_TFA9879
+@@ -1623,6 +1638,9 @@ config SND_SOC_TFA9879
tristate "NXP Semiconductors TFA9879 amplifier"
depends on I2C
config SND_SOC_TFA989X
tristate "NXP/Goodix TFA989X (TFA1) amplifiers"
depends on I2C
-@@ -2168,4 +2186,8 @@ config SND_SOC_LPASS_TX_MACRO
+@@ -2169,4 +2187,8 @@ config SND_SOC_LPASS_TX_MACRO
select SND_SOC_LPASS_MACRO_COMMON
tristate "Qualcomm TX Macro in LPASS(Low Power Audio SubSystem)"
* For devices with more than one control interface, we assume the
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
-@@ -2156,6 +2156,8 @@ static const struct usb_audio_quirk_flag
+@@ -2171,6 +2171,8 @@ static const struct usb_audio_quirk_flag
QUIRK_FLAG_FIXED_RATE),
DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */
QUIRK_FLAG_FIXED_RATE),
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
-@@ -772,6 +772,8 @@ static bool sc16is7xx_port_irq(struct sc
+@@ -770,6 +770,8 @@ static bool sc16is7xx_port_irq(struct sc
rxlen = sc16is7xx_port_read(port, SC16IS7XX_RXLVL_REG);
if (rxlen)
sc16is7xx_handle_rx(port, rxlen, iir);
static void iproc_rng200_cleanup(struct hwrng *rng)
{
struct iproc_rng200_dev *priv = to_rng_priv(rng);
-@@ -182,11 +248,17 @@ static int iproc_rng200_probe(struct pla
- return PTR_ERR(priv->base);
- }
+@@ -184,11 +250,17 @@ static int iproc_rng200_probe(struct pla
+
+ dev_set_drvdata(dev, priv);
- priv->rng.name = "iproc-rng200";
- priv->rng.read = iproc_rng200_read;
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
-@@ -1973,6 +1973,16 @@ reset:
+@@ -1977,6 +1977,16 @@ reset:
return ret;
}
* have been called previously. Use for set_configuration, set_interface,
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
-@@ -1268,6 +1268,21 @@ static void remove_intf_ep_devs(struct u
+@@ -1263,6 +1263,21 @@ static void remove_intf_ep_devs(struct u
intf->ep_devs_created = 0;
}
M: Alex Dubov <oakad@yahoo.com>
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
-@@ -1023,6 +1023,17 @@ config VIDEO_UDA1342
+@@ -1030,6 +1030,17 @@ config VIDEO_UDA1342
To compile this driver as a module, choose M here: the
module will be called uda1342.
M: Alex Dubov <oakad@yahoo.com>
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
-@@ -228,6 +228,17 @@ config VIDEO_IMX412
+@@ -235,6 +235,17 @@ config VIDEO_IMX412
To compile this driver as a module, choose M here: the
module will be called imx412.
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
-@@ -1366,6 +1366,18 @@ config VIDEO_TW9910
+@@ -1373,6 +1373,18 @@ config VIDEO_TW9910
To compile this driver as a module, choose M here: the
module will be called tw9910.
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
-@@ -1336,6 +1336,17 @@ config VIDEO_TW2804
+@@ -1343,6 +1343,17 @@ config VIDEO_TW2804
To compile this driver as a module, choose M here: the
module will be called tw2804.
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -3190,6 +3190,31 @@ static const struct panel_desc qishenglo
+@@ -3192,6 +3192,31 @@ static const struct panel_desc qishenglo
.connector_type = DRM_MODE_CONNECTOR_DPI,
};
static const struct display_timing rocktech_rk070er9427_timing = {
.pixelclock = { 26400000, 33300000, 46800000 },
.hactive = { 800, 800, 800 },
-@@ -4221,6 +4246,9 @@ static const struct of_device_id platfor
+@@ -4223,6 +4248,9 @@ static const struct of_device_id platfor
.compatible = "qishenglong,gopher2b-lcd",
.data = &qishenglong_gopher2b_lcd,
}, {
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -1944,6 +1944,32 @@ static const struct panel_desc friendlya
+@@ -1946,6 +1946,32 @@ static const struct panel_desc friendlya
},
};
static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
.clock = 9000,
.hdisplay = 480,
-@@ -4105,6 +4131,9 @@ static const struct of_device_id platfor
+@@ -4107,6 +4133,9 @@ static const struct of_device_id platfor
.compatible = "friendlyarm,hd702e",
.data = &friendlyarm_hd702e,
}, {
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
-@@ -395,6 +395,17 @@ config VIDEO_OV13B10
+@@ -402,6 +402,17 @@ config VIDEO_OV13B10
This is a Video4Linux2 sensor driver for the OmniVision
OV13B10 camera.
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
-@@ -810,6 +810,13 @@ endmenu
+@@ -817,6 +817,13 @@ endif
menu "Lens drivers"
visible if MEDIA_CAMERA_SUPPORT
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
-@@ -47,6 +47,17 @@ config VIDEO_AR0521
+@@ -54,6 +54,17 @@ config VIDEO_AR0521
To compile this driver as a module, choose M here: the
module will be called ar0521.
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
-@@ -409,7 +409,6 @@ config VIDEO_OV13B10
+@@ -416,7 +416,6 @@ config VIDEO_OV13B10
config VIDEO_OV2311
tristate "OmniVision OV2311 sensor support"
depends on I2C && VIDEO_DEV
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
-@@ -1367,7 +1367,6 @@ config VIDEO_TW2804
+@@ -1374,7 +1374,6 @@ config VIDEO_TW2804
config VIDEO_OV9281
tristate "OmniVision OV9281 sensor support"
depends on I2C && VIDEO_DEV
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
-@@ -1406,8 +1406,8 @@ config VIDEO_TW9910
+@@ -1413,8 +1413,8 @@ config VIDEO_TW9910
config VIDEO_IRS1125
tristate "Infineon IRS1125 sensor support"
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
-@@ -47,6 +47,17 @@ config VIDEO_AR0521
+@@ -54,6 +54,17 @@ config VIDEO_AR0521
To compile this driver as a module, choose M here: the
module will be called ar0521.
- MEDIA_BUS_FMT_RGB666_1X24_CPADHI
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2136,6 +2136,38 @@ static const struct panel_desc innolux_a
+@@ -2138,6 +2138,38 @@ static const struct panel_desc innolux_a
.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
};
static const struct drm_display_mode innolux_at070tn92_mode = {
.clock = 33333,
.hdisplay = 800,
-@@ -4141,6 +4173,9 @@ static const struct of_device_id platfor
+@@ -4143,6 +4175,9 @@ static const struct of_device_id platfor
.compatible = "innolux,at043tn24",
.data = &innolux_at043tn24,
}, {
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
-@@ -261,6 +261,19 @@ config VIDEO_IMX519
+@@ -268,6 +268,19 @@ config VIDEO_IMX519
To compile this driver as a module, choose M here: the
module will be called IMX519.
M: Bingbu Cao <bingbu.cao@intel.com>
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
-@@ -184,6 +184,19 @@ config VIDEO_IMX290
+@@ -191,6 +191,19 @@ config VIDEO_IMX290
To compile this driver as a module, choose M here: the
module will be called imx290.
--- a/drivers/char/hw_random/iproc-rng200.c
+++ b/drivers/char/hw_random/iproc-rng200.c
-@@ -250,6 +250,7 @@ static int iproc_rng200_probe(struct pla
+@@ -252,6 +252,7 @@ static int iproc_rng200_probe(struct pla
priv->rng.name = pdev->name;
priv->rng.cleanup = iproc_rng200_cleanup;
+++ /dev/null
-From 05d2c3d552b8c92fc397377d9d1112fc58e2cd59 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Fri, 7 Jul 2023 13:40:02 +0200
-Subject: [PATCH] ARM: dts: BCM53573: Drop nonexistent #usb-cells
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Such property simply doesn't exist (is not documented or used anywhere).
-
-This fixes:
-arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dtb: usb@d000: Unevaluated properties are not allowed ('#usb-cells' was unexpected)
- From schema: Documentation/devicetree/bindings/usb/generic-ohci.yaml
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Link: https://lore.kernel.org/r/20230707114004.2740-2-zajec5@gmail.com
-Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
----
- arch/arm/boot/dts/broadcom/bcm53573.dtsi | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/arch/arm/boot/dts/bcm53573.dtsi
-+++ b/arch/arm/boot/dts/bcm53573.dtsi
-@@ -156,8 +156,6 @@
- };
-
- ohci: usb@d000 {
-- #usb-cells = <0>;
--
- compatible = "generic-ohci";
- reg = <0xd000 0x1000>;
- interrupt-parent = <&gic>;
+++ /dev/null
-From 3392ef368d9b04622fe758b1079b512664b6110a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Fri, 7 Jul 2023 13:40:03 +0200
-Subject: [PATCH] ARM: dts: BCM53573: Add cells sizes to PCIe node
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes:
-arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dtb: pcie@2000: '#address-cells' is a required property
- From schema: /lib/python3.10/site-packages/dtschema/schemas/pci/pci-bus.yaml
-arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dtb: pcie@2000: '#size-cells' is a required property
- From schema: /lib/python3.10/site-packages/dtschema/schemas/pci/pci-bus.yaml
-
-Two properties that need to be added later are "device_type" and
-"ranges". Adding "device_type" on its own causes a new warning and the
-value of "ranges" needs to be determined yet.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Link: https://lore.kernel.org/r/20230707114004.2740-3-zajec5@gmail.com
-Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
----
- arch/arm/boot/dts/broadcom/bcm53573.dtsi | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/arch/arm/boot/dts/bcm53573.dtsi
-+++ b/arch/arm/boot/dts/bcm53573.dtsi
-@@ -127,6 +127,9 @@
-
- pcie0: pcie@2000 {
- reg = <0x00002000 0x1000>;
-+
-+ #address-cells = <3>;
-+ #size-cells = <2>;
- };
-
- usb2: usb2@4000 {
+++ /dev/null
-From 2c0fd6b3d0778ceab40205315ccef74568490f17 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Fri, 7 Jul 2023 13:40:04 +0200
-Subject: [PATCH] ARM: dts: BCM53573: Use updated "spi-gpio" binding properties
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Switch away from deprecated properties.
-
-This fixes:
-arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: gpio-sck: False schema does not allow [[3, 21, 0]]
- From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml
-arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: gpio-miso: False schema does not allow [[3, 22, 0]]
- From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml
-arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: gpio-mosi: False schema does not allow [[3, 23, 0]]
- From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml
-arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: 'sck-gpios' is a required property
- From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml
-arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: Unevaluated properties are not allowed ('gpio-miso', 'gpio-mosi', 'gpio-sck' were unexpected)
- From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Link: https://lore.kernel.org/r/20230707114004.2740-4-zajec5@gmail.com
-Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
----
- arch/arm/boot/dts/broadcom/bcm947189acdbmr.dts | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/dts/bcm947189acdbmr.dts
-+++ b/arch/arm/boot/dts/bcm947189acdbmr.dts
-@@ -60,9 +60,9 @@
- spi {
- compatible = "spi-gpio";
- num-chipselects = <1>;
-- gpio-sck = <&chipcommon 21 0>;
-- gpio-miso = <&chipcommon 22 0>;
-- gpio-mosi = <&chipcommon 23 0>;
-+ sck-gpios = <&chipcommon 21 0>;
-+ miso-gpios = <&chipcommon 22 0>;
-+ mosi-gpios = <&chipcommon 23 0>;
- cs-gpios = <&chipcommon 24 0>;
- #address-cells = <1>;
- #size-cells = <0>;
--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
-@@ -45,3 +45,16 @@
+@@ -58,3 +58,16 @@
};
};
};
+};
--- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
-@@ -81,3 +81,16 @@
+@@ -94,3 +94,16 @@
};
};
};
+++ /dev/null
-From 7141209db9c335ab261a17933809a3e660ebdc12 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Sun, 23 Jul 2023 21:54:14 +0200
-Subject: [PATCH] ARM: dts: BCM53573: Fix Tenda AC9 switch CPU port
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Primary Ethernet interface is connected to the port 8 (not 5).
-
-Fixes: 64612828628c ("ARM: dts: BCM53573: Add Tenda AC9 switch ports")
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Link: https://lore.kernel.org/r/20230723195416.7831-1-zajec5@gmail.com
-Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
----
- arch/arm/boot/dts/broadcom/bcm47189-tenda-ac9.dts | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
-+++ b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
-@@ -135,8 +135,8 @@
- label = "lan4";
- };
-
-- port@5 {
-- reg = <5>;
-+ port@8 {
-+ reg = <8>;
- label = "cpu";
- ethernet = <&gmac0>;
- };
--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
-@@ -60,3 +60,7 @@
+@@ -73,3 +73,7 @@
};
};
};
+};
--- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
-@@ -96,3 +96,7 @@
+@@ -109,3 +109,7 @@
};
};
};
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -275,19 +275,13 @@ config BMIPS_GENERIC
+@@ -274,19 +274,13 @@ config BMIPS_GENERIC
select SYNC_R4K
select COMMON_CLK
select BCM6345_L1_IRQ
select SWAP_IO_SPACE
select USB_EHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
-@@ -297,6 +291,7 @@ config BMIPS_GENERIC
+@@ -296,6 +290,7 @@ config BMIPS_GENERIC
select HAVE_PCI
select PCI_DRIVERS_GENERIC
select FW_CFE
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -289,7 +289,6 @@ config BMIPS_GENERIC
+@@ -288,7 +288,6 @@ config BMIPS_GENERIC
select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
select HARDIRQS_SW_RESEND
select HAVE_PCI
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
-@@ -790,6 +790,11 @@ static inline void obj_cgroup_put(struct
+@@ -795,6 +795,11 @@ static inline void obj_cgroup_put(struct
percpu_ref_put(&objcg->refcnt);
}
static inline void mem_cgroup_put(struct mem_cgroup *memcg)
{
if (memcg)
-@@ -1290,6 +1295,11 @@ static inline void obj_cgroup_put(struct
+@@ -1295,6 +1300,11 @@ static inline void obj_cgroup_put(struct
{
}
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
-@@ -1202,8 +1202,8 @@ static struct device_node *parse_prop_ce
+@@ -1144,8 +1144,8 @@ static struct device_node *parse_prop_ce
if (strcmp(prop_name, list_name))
return NULL;
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
-@@ -1307,7 +1307,7 @@ DEFINE_SIMPLE_PROP(dmas, "dmas", "#dma-c
+@@ -1249,7 +1249,7 @@ DEFINE_SIMPLE_PROP(dmas, "dmas", "#dma-c
DEFINE_SIMPLE_PROP(power_domains, "power-domains", "#power-domain-cells")
DEFINE_SIMPLE_PROP(hwlocks, "hwlocks", "#hwlock-cells")
DEFINE_SIMPLE_PROP(extcon, "extcon", NULL)
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -2003,7 +2003,7 @@ config PADATA
+@@ -2004,7 +2004,7 @@ config PADATA
bool
config ASN1
static void sock_def_write_space_wfree(struct sock *sk);
static void sock_def_write_space(struct sock *sk);
-@@ -582,6 +584,18 @@ discard_and_relse:
+@@ -584,6 +586,18 @@ discard_and_relse:
}
EXPORT_SYMBOL(__sk_receive_skb);
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *,
u32));
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *,
-@@ -2175,9 +2189,11 @@ static void __sk_free(struct sock *sk)
+@@ -2179,9 +2193,11 @@ static void __sk_free(struct sock *sk)
if (likely(sk->sk_net_refcnt))
sock_inuse_add(sock_net(sk), -1);
if (!pe)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
-@@ -4187,6 +4187,8 @@ static const struct seq_operations vmall
+@@ -4205,6 +4205,8 @@ static const struct seq_operations vmall
static int __init proc_vmalloc_init(void)
{
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -4100,6 +4100,8 @@ static __net_initdata struct pernet_oper
+@@ -4104,6 +4104,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1481,6 +1481,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
+@@ -1482,6 +1482,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
the unaligned access emulation.
see arch/parisc/kernel/unaligned.c for reference
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1035,9 +1035,6 @@ config FW_ARC
+@@ -1034,9 +1034,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool
config CEVT_BCM1480
bool
-@@ -3092,6 +3089,18 @@ choice
+@@ -3091,6 +3088,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice
default y
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
-@@ -1049,6 +1049,8 @@ static u8 spi_nor_convert_3to4_erase(u8
+@@ -1050,6 +1050,8 @@ static u8 spi_nor_convert_3to4_erase(u8
static bool spi_nor_has_uniform_erase(const struct spi_nor *nor)
{
return !!nor->params->erase_map.uniform_erase_type;
}
-@@ -2157,6 +2159,7 @@ static int spi_nor_select_erase(struct s
+@@ -2158,6 +2160,7 @@ static int spi_nor_select_erase(struct s
{
struct spi_nor_erase_map *map = &nor->params->erase_map;
const struct spi_nor_erase_type *erase = NULL;
struct mtd_info *mtd = &nor->mtd;
u32 wanted_size = nor->info->sector_size;
int i;
-@@ -2189,8 +2192,9 @@ static int spi_nor_select_erase(struct s
+@@ -2190,8 +2193,9 @@ static int spi_nor_select_erase(struct s
*/
for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) {
if (map->erase_type[i].size) {
}
}
-@@ -2198,6 +2202,9 @@ static int spi_nor_select_erase(struct s
+@@ -2199,6 +2203,9 @@ static int spi_nor_select_erase(struct s
return -EINVAL;
mtd->erasesize = erase->size;
+};
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
-@@ -1635,6 +1635,7 @@ static const struct spi_nor_manufacturer
+@@ -1636,6 +1636,7 @@ static const struct spi_nor_manufacturer
&spi_nor_winbond,
&spi_nor_xilinx,
&spi_nor_xmc,
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1826,6 +1826,15 @@ config EMBEDDED
+@@ -1827,6 +1827,15 @@ config EMBEDDED
an embedded system so certain expert options are available
for configuration.
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
-@@ -2899,6 +2899,18 @@ static const struct flash_info *spi_nor_
+@@ -2900,6 +2900,18 @@ static const struct flash_info *spi_nor_
return NULL;
}
static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor,
const char *name)
{
-@@ -3002,6 +3014,9 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3003,6 +3015,9 @@ int spi_nor_scan(struct spi_nor *nor, co
if (!nor->bouncebuf)
return -ENOMEM;
===============================================================================
--- a/arch/um/drivers/Kconfig
+++ b/arch/um/drivers/Kconfig
-@@ -153,6 +153,20 @@ config UML_NET
+@@ -143,6 +143,20 @@ config UML_NET
enable at least one of the following transport options to actually
make use of UML networking.
projects / openwrt / staging / hauke.git / commitdiff