kernel: bump 5.10 to 5.10.163
Removed upstreamed: generic/101-Use-stddefs.h-instead-of-compiler.h.patch[1] All patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.163&id=ddd2bb08bd99b7ee4442fbbe0f9b80236fdd71d2 Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
		 John Audia
					John Audia
				
			
				
					committed by
					
						 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
						parent
						
							990419dac3
						
					
				
				
					commit
					2835df54ab
				
			| @@ -1,2 +1,2 @@ | |||||||
| LINUX_VERSION-5.10 = .162 | LINUX_VERSION-5.10 = .163 | ||||||
| LINUX_KERNEL_HASH-5.10.162 = 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 | LINUX_KERNEL_HASH-5.10.163 = 96e226e2d388abc0600434e0f4f365a8829ef901f4d8e761e7ffe2799dc09b20 | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org> | |||||||
|  |  | ||||||
| --- a/drivers/regulator/core.c | --- a/drivers/regulator/core.c | ||||||
| +++ b/drivers/regulator/core.c | +++ b/drivers/regulator/core.c | ||||||
| @@ -2992,7 +2992,8 @@ static int _regulator_list_voltage(struc | @@ -3000,7 +3000,8 @@ static int _regulator_list_voltage(struc | ||||||
|  		return rdev->desc->fixed_uV; |  		return rdev->desc->fixed_uV; | ||||||
|   |   | ||||||
|  	if (ops->list_voltage) { |  	if (ops->list_voltage) { | ||||||
| @@ -30,7 +30,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org> | |||||||
|  			return -EINVAL; |  			return -EINVAL; | ||||||
|  		if (lock) |  		if (lock) | ||||||
|  			regulator_lock(rdev); |  			regulator_lock(rdev); | ||||||
| @@ -3143,7 +3144,8 @@ int regulator_list_hardware_vsel(struct | @@ -3151,7 +3152,8 @@ int regulator_list_hardware_vsel(struct | ||||||
|  	struct regulator_dev *rdev = regulator->rdev; |  	struct regulator_dev *rdev = regulator->rdev; | ||||||
|  	const struct regulator_ops *ops = rdev->desc->ops; |  	const struct regulator_ops *ops = rdev->desc->ops; | ||||||
|   |   | ||||||
| @@ -40,7 +40,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org> | |||||||
|  		return -EINVAL; |  		return -EINVAL; | ||||||
|  	if (ops->set_voltage_sel != regulator_set_voltage_sel_regmap) |  	if (ops->set_voltage_sel != regulator_set_voltage_sel_regmap) | ||||||
|  		return -EOPNOTSUPP; |  		return -EOPNOTSUPP; | ||||||
| @@ -4066,6 +4068,9 @@ int regulator_set_voltage_time(struct re | @@ -4074,6 +4076,9 @@ int regulator_set_voltage_time(struct re | ||||||
|   |   | ||||||
|  	for (i = 0; i < rdev->desc->n_voltages; i++) { |  	for (i = 0; i < rdev->desc->n_voltages; i++) { | ||||||
|  		/* We only look for exact voltage matches here */ |  		/* We only look for exact voltage matches here */ | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org> | |||||||
|  |  | ||||||
| --- a/drivers/regulator/core.c | --- a/drivers/regulator/core.c | ||||||
| +++ b/drivers/regulator/core.c | +++ b/drivers/regulator/core.c | ||||||
| @@ -4071,6 +4071,9 @@ int regulator_set_voltage_time(struct re | @@ -4079,6 +4079,9 @@ int regulator_set_voltage_time(struct re | ||||||
|  		if (i < rdev->desc->linear_min_sel) |  		if (i < rdev->desc->linear_min_sel) | ||||||
|  			continue; |  			continue; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -21,7 +21,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org> | |||||||
|  |  | ||||||
| --- a/drivers/regulator/core.c | --- a/drivers/regulator/core.c | ||||||
| +++ b/drivers/regulator/core.c | +++ b/drivers/regulator/core.c | ||||||
| @@ -2992,9 +2992,10 @@ static int _regulator_list_voltage(struc | @@ -3000,9 +3000,10 @@ static int _regulator_list_voltage(struc | ||||||
|  		return rdev->desc->fixed_uV; |  		return rdev->desc->fixed_uV; | ||||||
|   |   | ||||||
|  	if (ops->list_voltage) { |  	if (ops->list_voltage) { | ||||||
| @@ -34,7 +34,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org> | |||||||
|  		if (lock) |  		if (lock) | ||||||
|  			regulator_lock(rdev); |  			regulator_lock(rdev); | ||||||
|  		ret = ops->list_voltage(rdev, selector); |  		ret = ops->list_voltage(rdev, selector); | ||||||
| @@ -3144,9 +3145,10 @@ int regulator_list_hardware_vsel(struct | @@ -3152,9 +3153,10 @@ int regulator_list_hardware_vsel(struct | ||||||
|  	struct regulator_dev *rdev = regulator->rdev; |  	struct regulator_dev *rdev = regulator->rdev; | ||||||
|  	const struct regulator_ops *ops = rdev->desc->ops; |  	const struct regulator_ops *ops = rdev->desc->ops; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com> | |||||||
|  |  | ||||||
| --- a/drivers/mtd/spi-nor/core.c | --- a/drivers/mtd/spi-nor/core.c | ||||||
| +++ b/drivers/mtd/spi-nor/core.c | +++ b/drivers/mtd/spi-nor/core.c | ||||||
| @@ -3141,6 +3141,7 @@ int spi_nor_scan(struct spi_nor *nor, co | @@ -3143,6 +3143,7 @@ int spi_nor_scan(struct spi_nor *nor, co | ||||||
|  	struct device *dev = nor->dev; |  	struct device *dev = nor->dev; | ||||||
|  	struct mtd_info *mtd = &nor->mtd; |  	struct mtd_info *mtd = &nor->mtd; | ||||||
|  	struct device_node *np = spi_nor_get_flash_node(nor); |  	struct device_node *np = spi_nor_get_flash_node(nor); | ||||||
| @@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com> | |||||||
|  	int ret; |  	int ret; | ||||||
|  	int i; |  	int i; | ||||||
|   |   | ||||||
| @@ -3195,7 +3196,12 @@ int spi_nor_scan(struct spi_nor *nor, co | @@ -3197,7 +3198,12 @@ int spi_nor_scan(struct spi_nor *nor, co | ||||||
|  	if (ret) |  	if (ret) | ||||||
|  		return ret; |  		return ret; | ||||||
|   |   | ||||||
| @@ -34,7 +34,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com> | |||||||
|  	mtd->type = MTD_NORFLASH; |  	mtd->type = MTD_NORFLASH; | ||||||
| --- a/drivers/mtd/mtdcore.c | --- a/drivers/mtd/mtdcore.c | ||||||
| +++ b/drivers/mtd/mtdcore.c | +++ b/drivers/mtd/mtdcore.c | ||||||
| @@ -848,6 +848,17 @@ out_error: | @@ -850,6 +850,17 @@ out_error: | ||||||
|   */ |   */ | ||||||
|  static void mtd_set_dev_defaults(struct mtd_info *mtd) |  static void mtd_set_dev_defaults(struct mtd_info *mtd) | ||||||
|  { |  { | ||||||
|   | |||||||
| @@ -116,7 +116,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> | |||||||
|  } |  } | ||||||
| --- a/drivers/gpio/gpiolib.c | --- a/drivers/gpio/gpiolib.c | ||||||
| +++ b/drivers/gpio/gpiolib.c | +++ b/drivers/gpio/gpiolib.c | ||||||
| @@ -1912,7 +1912,8 @@ int gpiochip_add_pingroup_range(struct g | @@ -1911,7 +1911,8 @@ int gpiochip_add_pingroup_range(struct g | ||||||
|   |   | ||||||
|  	list_add_tail(&pin_range->node, &gdev->pin_ranges); |  	list_add_tail(&pin_range->node, &gdev->pin_ranges); | ||||||
|   |   | ||||||
| @@ -126,7 +126,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> | |||||||
|  } |  } | ||||||
|  EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range); |  EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range); | ||||||
|   |   | ||||||
| @@ -1969,7 +1970,7 @@ int gpiochip_add_pin_range(struct gpio_c | @@ -1968,7 +1969,7 @@ int gpiochip_add_pin_range(struct gpio_c | ||||||
|   |   | ||||||
|  	list_add_tail(&pin_range->node, &gdev->pin_ranges); |  	list_add_tail(&pin_range->node, &gdev->pin_ranges); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -107,7 +107,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  } |  } | ||||||
|   |   | ||||||
|  static struct clk clk_pcie = { |  static struct clk clk_pcie = { | ||||||
| @@ -548,6 +562,21 @@ static struct clk_lookup bcm6368_clks[] | @@ -550,6 +564,21 @@ static struct clk_lookup bcm6368_clks[] | ||||||
|  	CLKDEV_INIT(NULL, "ipsec", &clk_ipsec), |  	CLKDEV_INIT(NULL, "ipsec", &clk_ipsec), | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -129,7 +129,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  #define HSSPI_PLL_HZ_6328	133333333 |  #define HSSPI_PLL_HZ_6328	133333333 | ||||||
|  #define HSSPI_PLL_HZ_6362	400000000 |  #define HSSPI_PLL_HZ_6362	400000000 | ||||||
|   |   | ||||||
| @@ -580,6 +609,10 @@ static int __init bcm63xx_clk_init(void) | @@ -582,6 +611,10 @@ static int __init bcm63xx_clk_init(void) | ||||||
|  	case BCM6368_CPU_ID: |  	case BCM6368_CPU_ID: | ||||||
|  		clkdev_add_table(bcm6368_clks, ARRAY_SIZE(bcm6368_clks)); |  		clkdev_add_table(bcm6368_clks, ARRAY_SIZE(bcm6368_clks)); | ||||||
|  		break; |  		break; | ||||||
|   | |||||||
| @@ -57,7 +57,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 | |||||||
|  		mask = CKCTL_6328_HSSPI_EN; |  		mask = CKCTL_6328_HSSPI_EN; | ||||||
|  	else if (BCMCPU_IS_6362()) |  	else if (BCMCPU_IS_6362()) | ||||||
|  		mask = CKCTL_6362_HSSPI_EN; |  		mask = CKCTL_6362_HSSPI_EN; | ||||||
| @@ -456,6 +458,19 @@ static struct clk_lookup bcm3368_clks[] | @@ -458,6 +460,19 @@ static struct clk_lookup bcm3368_clks[] | ||||||
|  	CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1), |  	CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1), | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -77,7 +77,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 | |||||||
|  static struct clk_lookup bcm6328_clks[] = { |  static struct clk_lookup bcm6328_clks[] = { | ||||||
|  	/* fixed rate clocks */ |  	/* fixed rate clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "periph", &clk_periph), |  	CLKDEV_INIT(NULL, "periph", &clk_periph), | ||||||
| @@ -577,6 +592,7 @@ static struct clk_lookup bcm63268_clks[] | @@ -579,6 +594,7 @@ static struct clk_lookup bcm63268_clks[] | ||||||
|  	CLKDEV_INIT(NULL, "pcie", &clk_pcie), |  	CLKDEV_INIT(NULL, "pcie", &clk_pcie), | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -85,7 +85,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 | |||||||
|  #define HSSPI_PLL_HZ_6328	133333333 |  #define HSSPI_PLL_HZ_6328	133333333 | ||||||
|  #define HSSPI_PLL_HZ_6362	400000000 |  #define HSSPI_PLL_HZ_6362	400000000 | ||||||
|   |   | ||||||
| @@ -586,6 +602,10 @@ static int __init bcm63xx_clk_init(void) | @@ -588,6 +604,10 @@ static int __init bcm63xx_clk_init(void) | ||||||
|  	case BCM3368_CPU_ID: |  	case BCM3368_CPU_ID: | ||||||
|  		clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks)); |  		clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks)); | ||||||
|  		break; |  		break; | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree | |||||||
|  |  | ||||||
| --- a/arch/mips/bcm63xx/clk.c | --- a/arch/mips/bcm63xx/clk.c | ||||||
| +++ b/arch/mips/bcm63xx/clk.c | +++ b/arch/mips/bcm63xx/clk.c | ||||||
| @@ -501,6 +501,8 @@ static struct clk_lookup bcm3368_clks[] | @@ -503,6 +503,8 @@ static struct clk_lookup bcm3368_clks[] | ||||||
|  	CLKDEV_INIT(NULL, "periph", &clk_periph), |  	CLKDEV_INIT(NULL, "periph", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), | ||||||
| @@ -18,7 +18,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree | |||||||
|  	/* gated clocks */ |  	/* gated clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "enet0", &clk_enet0), |  	CLKDEV_INIT(NULL, "enet0", &clk_enet0), | ||||||
|  	CLKDEV_INIT(NULL, "enet1", &clk_enet1), |  	CLKDEV_INIT(NULL, "enet1", &clk_enet1), | ||||||
| @@ -517,7 +519,9 @@ static struct clk_lookup bcm6318_clks[] | @@ -519,7 +521,9 @@ static struct clk_lookup bcm6318_clks[] | ||||||
|  	/* fixed rate clocks */ |  	/* fixed rate clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "periph", &clk_periph), |  	CLKDEV_INIT(NULL, "periph", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), | ||||||
| @@ -28,7 +28,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree | |||||||
|  	/* gated clocks */ |  	/* gated clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), |  	CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), | ||||||
|  	CLKDEV_INIT(NULL, "usbh", &clk_usbh), |  	CLKDEV_INIT(NULL, "usbh", &clk_usbh), | ||||||
| @@ -531,7 +535,10 @@ static struct clk_lookup bcm6328_clks[] | @@ -533,7 +537,10 @@ static struct clk_lookup bcm6328_clks[] | ||||||
|  	CLKDEV_INIT(NULL, "periph", &clk_periph), |  	CLKDEV_INIT(NULL, "periph", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), | ||||||
| @@ -39,7 +39,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree | |||||||
|  	/* gated clocks */ |  	/* gated clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), |  	CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), | ||||||
|  	CLKDEV_INIT(NULL, "usbh", &clk_usbh), |  	CLKDEV_INIT(NULL, "usbh", &clk_usbh), | ||||||
| @@ -544,6 +551,7 @@ static struct clk_lookup bcm6338_clks[] | @@ -546,6 +553,7 @@ static struct clk_lookup bcm6338_clks[] | ||||||
|  	/* fixed rate clocks */ |  	/* fixed rate clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "periph", &clk_periph), |  	CLKDEV_INIT(NULL, "periph", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), | ||||||
| @@ -47,7 +47,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree | |||||||
|  	/* gated clocks */ |  	/* gated clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "enet0", &clk_enet0), |  	CLKDEV_INIT(NULL, "enet0", &clk_enet0), | ||||||
|  	CLKDEV_INIT(NULL, "enet1", &clk_enet1), |  	CLKDEV_INIT(NULL, "enet1", &clk_enet1), | ||||||
| @@ -558,6 +566,7 @@ static struct clk_lookup bcm6345_clks[] | @@ -560,6 +568,7 @@ static struct clk_lookup bcm6345_clks[] | ||||||
|  	/* fixed rate clocks */ |  	/* fixed rate clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "periph", &clk_periph), |  	CLKDEV_INIT(NULL, "periph", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), | ||||||
| @@ -55,7 +55,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree | |||||||
|  	/* gated clocks */ |  	/* gated clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "enet0", &clk_enet0), |  	CLKDEV_INIT(NULL, "enet0", &clk_enet0), | ||||||
|  	CLKDEV_INIT(NULL, "enet1", &clk_enet1), |  	CLKDEV_INIT(NULL, "enet1", &clk_enet1), | ||||||
| @@ -572,6 +581,7 @@ static struct clk_lookup bcm6348_clks[] | @@ -574,6 +583,7 @@ static struct clk_lookup bcm6348_clks[] | ||||||
|  	/* fixed rate clocks */ |  	/* fixed rate clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "periph", &clk_periph), |  	CLKDEV_INIT(NULL, "periph", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), | ||||||
| @@ -63,7 +63,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree | |||||||
|  	/* gated clocks */ |  	/* gated clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "enet0", &clk_enet0), |  	CLKDEV_INIT(NULL, "enet0", &clk_enet0), | ||||||
|  	CLKDEV_INIT(NULL, "enet1", &clk_enet1), |  	CLKDEV_INIT(NULL, "enet1", &clk_enet1), | ||||||
| @@ -588,6 +598,8 @@ static struct clk_lookup bcm6358_clks[] | @@ -590,6 +600,8 @@ static struct clk_lookup bcm6358_clks[] | ||||||
|  	CLKDEV_INIT(NULL, "periph", &clk_periph), |  	CLKDEV_INIT(NULL, "periph", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), | ||||||
| @@ -72,7 +72,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree | |||||||
|  	/* gated clocks */ |  	/* gated clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "enet0", &clk_enet0), |  	CLKDEV_INIT(NULL, "enet0", &clk_enet0), | ||||||
|  	CLKDEV_INIT(NULL, "enet1", &clk_enet1), |  	CLKDEV_INIT(NULL, "enet1", &clk_enet1), | ||||||
| @@ -607,7 +619,10 @@ static struct clk_lookup bcm6362_clks[] | @@ -609,7 +621,10 @@ static struct clk_lookup bcm6362_clks[] | ||||||
|  	CLKDEV_INIT(NULL, "periph", &clk_periph), |  	CLKDEV_INIT(NULL, "periph", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), | ||||||
| @@ -83,7 +83,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree | |||||||
|  	/* gated clocks */ |  	/* gated clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), |  	CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), | ||||||
|  	CLKDEV_INIT(NULL, "usbh", &clk_usbh), |  	CLKDEV_INIT(NULL, "usbh", &clk_usbh), | ||||||
| @@ -623,6 +638,8 @@ static struct clk_lookup bcm6368_clks[] | @@ -625,6 +640,8 @@ static struct clk_lookup bcm6368_clks[] | ||||||
|  	CLKDEV_INIT(NULL, "periph", &clk_periph), |  	CLKDEV_INIT(NULL, "periph", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), | ||||||
| @@ -92,7 +92,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree | |||||||
|  	/* gated clocks */ |  	/* gated clocks */ | ||||||
|  	CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), |  	CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), | ||||||
|  	CLKDEV_INIT(NULL, "usbh", &clk_usbh), |  	CLKDEV_INIT(NULL, "usbh", &clk_usbh), | ||||||
| @@ -637,7 +654,10 @@ static struct clk_lookup bcm63268_clks[] | @@ -639,7 +656,10 @@ static struct clk_lookup bcm63268_clks[] | ||||||
|  	CLKDEV_INIT(NULL, "periph", &clk_periph), |  	CLKDEV_INIT(NULL, "periph", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), | ||||||
|  	CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), |  	CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), | ||||||
|   | |||||||
| @@ -24,7 +24,7 @@ | |||||||
|   * Internal peripheral clock |   * Internal peripheral clock | ||||||
|   */ |   */ | ||||||
|  static struct clk clk_periph = { |  static struct clk clk_periph = { | ||||||
| @@ -624,6 +641,7 @@ static struct clk_lookup bcm6362_clks[] | @@ -626,6 +643,7 @@ static struct clk_lookup bcm6362_clks[] | ||||||
|  	CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll), |  	CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll), | ||||||
|  	CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll), |  	CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll), | ||||||
|  	/* gated clocks */ |  	/* gated clocks */ | ||||||
| @@ -32,7 +32,7 @@ | |||||||
|  	CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), |  	CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), | ||||||
|  	CLKDEV_INIT(NULL, "usbh", &clk_usbh), |  	CLKDEV_INIT(NULL, "usbh", &clk_usbh), | ||||||
|  	CLKDEV_INIT(NULL, "usbd", &clk_usbd), |  	CLKDEV_INIT(NULL, "usbd", &clk_usbd), | ||||||
| @@ -641,6 +659,7 @@ static struct clk_lookup bcm6368_clks[] | @@ -643,6 +661,7 @@ static struct clk_lookup bcm6368_clks[] | ||||||
|  	CLKDEV_INIT("10000100.serial", "refclk", &clk_periph), |  	CLKDEV_INIT("10000100.serial", "refclk", &clk_periph), | ||||||
|  	CLKDEV_INIT("10000120.serial", "refclk", &clk_periph), |  	CLKDEV_INIT("10000120.serial", "refclk", &clk_periph), | ||||||
|  	/* gated clocks */ |  	/* gated clocks */ | ||||||
| @@ -40,7 +40,7 @@ | |||||||
|  	CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), |  	CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), | ||||||
|  	CLKDEV_INIT(NULL, "usbh", &clk_usbh), |  	CLKDEV_INIT(NULL, "usbh", &clk_usbh), | ||||||
|  	CLKDEV_INIT(NULL, "usbd", &clk_usbd), |  	CLKDEV_INIT(NULL, "usbd", &clk_usbd), | ||||||
| @@ -659,6 +678,7 @@ static struct clk_lookup bcm63268_clks[] | @@ -661,6 +680,7 @@ static struct clk_lookup bcm63268_clks[] | ||||||
|  	CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll), |  	CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll), | ||||||
|  	CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll), |  	CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll), | ||||||
|  	/* gated clocks */ |  	/* gated clocks */ | ||||||
|   | |||||||
| @@ -103,4 +103,4 @@ Link: https://lore.kernel.org/linux-mtd/20220622010628.30414-4-ansuelsmth@gmail. | |||||||
| +	mtd_check_of_node(mtd); | +	mtd_check_of_node(mtd); | ||||||
|  	of_node_get(mtd_get_of_node(mtd)); |  	of_node_get(mtd_get_of_node(mtd)); | ||||||
|  	error = device_register(&mtd->dev); |  	error = device_register(&mtd->dev); | ||||||
|  	if (error) |  	if (error) { | ||||||
|   | |||||||
| @@ -25,7 +25,7 @@ Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | |||||||
|  |  | ||||||
| --- a/drivers/mtd/mtdcore.c | --- a/drivers/mtd/mtdcore.c | ||||||
| +++ b/drivers/mtd/mtdcore.c | +++ b/drivers/mtd/mtdcore.c | ||||||
| @@ -1070,6 +1070,34 @@ int __get_mtd_device(struct mtd_info *mt | @@ -1072,6 +1072,34 @@ int __get_mtd_device(struct mtd_info *mt | ||||||
|  EXPORT_SYMBOL_GPL(__get_mtd_device); |  EXPORT_SYMBOL_GPL(__get_mtd_device); | ||||||
|   |   | ||||||
|  /** |  /** | ||||||
|   | |||||||
| @@ -27,7 +27,7 @@ Link: https://lore.kernel.org/linux-mtd/20221022211318.32009-2-zajec5@gmail.com | |||||||
|   |   | ||||||
|  #include <linux/mtd/mtd.h> |  #include <linux/mtd/mtd.h> | ||||||
|  #include <linux/mtd/partitions.h> |  #include <linux/mtd/partitions.h> | ||||||
| @@ -743,6 +744,17 @@ int add_mtd_device(struct mtd_info *mtd) | @@ -745,6 +746,17 @@ int add_mtd_device(struct mtd_info *mtd) | ||||||
|  		not->add(mtd); |  		not->add(mtd); | ||||||
|   |   | ||||||
|  	mutex_unlock(&mtd_table_mutex); |  	mutex_unlock(&mtd_table_mutex); | ||||||
|   | |||||||
| @@ -30,7 +30,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -347,6 +347,7 @@ struct napi_struct { | @@ -354,6 +354,7 @@ struct napi_struct { | ||||||
|  	struct list_head	dev_list; |  	struct list_head	dev_list; | ||||||
|  	struct hlist_node	napi_hash_node; |  	struct hlist_node	napi_hash_node; | ||||||
|  	unsigned int		napi_id; |  	unsigned int		napi_id; | ||||||
| @@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  enum { |  enum { | ||||||
| @@ -357,6 +358,7 @@ enum { | @@ -364,6 +365,7 @@ enum { | ||||||
|  	NAPI_STATE_LISTED,	/* NAPI added to system lists */ |  	NAPI_STATE_LISTED,	/* NAPI added to system lists */ | ||||||
|  	NAPI_STATE_NO_BUSY_POLL,/* Do not add in napi_hash, no busy polling */ |  	NAPI_STATE_NO_BUSY_POLL,/* Do not add in napi_hash, no busy polling */ | ||||||
|  	NAPI_STATE_IN_BUSY_POLL,/* sk_busy_loop() owns this NAPI */ |  	NAPI_STATE_IN_BUSY_POLL,/* sk_busy_loop() owns this NAPI */ | ||||||
| @@ -46,7 +46,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  enum { |  enum { | ||||||
| @@ -367,6 +369,7 @@ enum { | @@ -374,6 +376,7 @@ enum { | ||||||
|  	NAPIF_STATE_LISTED	 = BIT(NAPI_STATE_LISTED), |  	NAPIF_STATE_LISTED	 = BIT(NAPI_STATE_LISTED), | ||||||
|  	NAPIF_STATE_NO_BUSY_POLL = BIT(NAPI_STATE_NO_BUSY_POLL), |  	NAPIF_STATE_NO_BUSY_POLL = BIT(NAPI_STATE_NO_BUSY_POLL), | ||||||
|  	NAPIF_STATE_IN_BUSY_POLL = BIT(NAPI_STATE_IN_BUSY_POLL), |  	NAPIF_STATE_IN_BUSY_POLL = BIT(NAPI_STATE_IN_BUSY_POLL), | ||||||
| @@ -54,7 +54,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  enum gro_result { |  enum gro_result { | ||||||
| @@ -497,20 +500,7 @@ static inline bool napi_complete(struct | @@ -504,20 +507,7 @@ static inline bool napi_complete(struct | ||||||
|   */ |   */ | ||||||
|  void napi_disable(struct napi_struct *n); |  void napi_disable(struct napi_struct *n); | ||||||
|   |   | ||||||
| @@ -76,7 +76,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|   |   | ||||||
|  /** |  /** | ||||||
|   *	napi_synchronize - wait until NAPI is not running |   *	napi_synchronize - wait until NAPI is not running | ||||||
| @@ -1856,6 +1846,8 @@ enum netdev_ml_priv_type { | @@ -1863,6 +1853,8 @@ enum netdev_ml_priv_type { | ||||||
|   * |   * | ||||||
|   *	@wol_enabled:	Wake-on-LAN is enabled |   *	@wol_enabled:	Wake-on-LAN is enabled | ||||||
|   * |   * | ||||||
| @@ -85,7 +85,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|   *	@net_notifier_list:	List of per-net netdev notifier block |   *	@net_notifier_list:	List of per-net netdev notifier block | ||||||
|   *				that follow this device when it is moved |   *				that follow this device when it is moved | ||||||
|   *				to another network namespace. |   *				to another network namespace. | ||||||
| @@ -2175,6 +2167,7 @@ struct net_device { | @@ -2182,6 +2174,7 @@ struct net_device { | ||||||
|  	struct lock_class_key	*qdisc_running_key; |  	struct lock_class_key	*qdisc_running_key; | ||||||
|  	bool			proto_down; |  	bool			proto_down; | ||||||
|  	unsigned		wol_enabled:1; |  	unsigned		wol_enabled:1; | ||||||
|   | |||||||
| @@ -46,7 +46,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
| +		== ================================== | +		== ================================== | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -491,6 +491,8 @@ static inline bool napi_complete(struct | @@ -498,6 +498,8 @@ static inline bool napi_complete(struct | ||||||
|  	return napi_complete_done(n, 0); |  	return napi_complete_done(n, 0); | ||||||
|  } |  } | ||||||
|   |   | ||||||
|   | |||||||
| @@ -27,7 +27,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -359,6 +359,7 @@ enum { | @@ -366,6 +366,7 @@ enum { | ||||||
|  	NAPI_STATE_NO_BUSY_POLL,/* Do not add in napi_hash, no busy polling */ |  	NAPI_STATE_NO_BUSY_POLL,/* Do not add in napi_hash, no busy polling */ | ||||||
|  	NAPI_STATE_IN_BUSY_POLL,/* sk_busy_loop() owns this NAPI */ |  	NAPI_STATE_IN_BUSY_POLL,/* sk_busy_loop() owns this NAPI */ | ||||||
|  	NAPI_STATE_THREADED,		/* The poll is performed inside its own thread*/ |  	NAPI_STATE_THREADED,		/* The poll is performed inside its own thread*/ | ||||||
| @@ -35,7 +35,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  enum { |  enum { | ||||||
| @@ -370,6 +371,7 @@ enum { | @@ -377,6 +378,7 @@ enum { | ||||||
|  	NAPIF_STATE_NO_BUSY_POLL = BIT(NAPI_STATE_NO_BUSY_POLL), |  	NAPIF_STATE_NO_BUSY_POLL = BIT(NAPI_STATE_NO_BUSY_POLL), | ||||||
|  	NAPIF_STATE_IN_BUSY_POLL = BIT(NAPI_STATE_IN_BUSY_POLL), |  	NAPIF_STATE_IN_BUSY_POLL = BIT(NAPI_STATE_IN_BUSY_POLL), | ||||||
|  	NAPIF_STATE_THREADED	 = BIT(NAPI_STATE_THREADED), |  	NAPIF_STATE_THREADED	 = BIT(NAPI_STATE_THREADED), | ||||||
|   | |||||||
| @@ -58,7 +58,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -841,6 +841,27 @@ typedef u16 (*select_queue_fallback_t)(s | @@ -848,6 +848,27 @@ typedef u16 (*select_queue_fallback_t)(s | ||||||
|  				       struct sk_buff *skb, |  				       struct sk_buff *skb, | ||||||
|  				       struct net_device *sb_dev); |  				       struct net_device *sb_dev); | ||||||
|   |   | ||||||
| @@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  enum tc_setup_type { |  enum tc_setup_type { | ||||||
|  	TC_SETUP_QDISC_MQPRIO, |  	TC_SETUP_QDISC_MQPRIO, | ||||||
|  	TC_SETUP_CLSU32, |  	TC_SETUP_CLSU32, | ||||||
| @@ -1287,6 +1308,8 @@ struct netdev_net_notifier { | @@ -1294,6 +1315,8 @@ struct netdev_net_notifier { | ||||||
|   * struct net_device *(*ndo_get_peer_dev)(struct net_device *dev); |   * struct net_device *(*ndo_get_peer_dev)(struct net_device *dev); | ||||||
|   *	If a device is paired with a peer device, return the peer instance. |   *	If a device is paired with a peer device, return the peer instance. | ||||||
|   *	The caller must be under RCU read context. |   *	The caller must be under RCU read context. | ||||||
| @@ -95,7 +95,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|   */ |   */ | ||||||
|  struct net_device_ops { |  struct net_device_ops { | ||||||
|  	int			(*ndo_init)(struct net_device *dev); |  	int			(*ndo_init)(struct net_device *dev); | ||||||
| @@ -1495,6 +1518,8 @@ struct net_device_ops { | @@ -1502,6 +1525,8 @@ struct net_device_ops { | ||||||
|  	int			(*ndo_tunnel_ctl)(struct net_device *dev, |  	int			(*ndo_tunnel_ctl)(struct net_device *dev, | ||||||
|  						  struct ip_tunnel_parm *p, int cmd); |  						  struct ip_tunnel_parm *p, int cmd); | ||||||
|  	struct net_device *	(*ndo_get_peer_dev)(struct net_device *dev); |  	struct net_device *	(*ndo_get_peer_dev)(struct net_device *dev); | ||||||
| @@ -104,7 +104,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  /** |  /** | ||||||
| @@ -2842,6 +2867,8 @@ void dev_remove_offload(struct packet_of | @@ -2849,6 +2874,8 @@ void dev_remove_offload(struct packet_of | ||||||
|   |   | ||||||
|  int dev_get_iflink(const struct net_device *dev); |  int dev_get_iflink(const struct net_device *dev); | ||||||
|  int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb); |  int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb); | ||||||
|   | |||||||
| @@ -28,7 +28,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -843,11 +843,18 @@ typedef u16 (*select_queue_fallback_t)(s | @@ -850,11 +850,18 @@ typedef u16 (*select_queue_fallback_t)(s | ||||||
|   |   | ||||||
|  enum net_device_path_type { |  enum net_device_path_type { | ||||||
|  	DEV_PATH_ETHERNET = 0, |  	DEV_PATH_ETHERNET = 0, | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -844,6 +844,7 @@ typedef u16 (*select_queue_fallback_t)(s | @@ -851,6 +851,7 @@ typedef u16 (*select_queue_fallback_t)(s | ||||||
|  enum net_device_path_type { |  enum net_device_path_type { | ||||||
|  	DEV_PATH_ETHERNET = 0, |  	DEV_PATH_ETHERNET = 0, | ||||||
|  	DEV_PATH_VLAN, |  	DEV_PATH_VLAN, | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -855,10 +855,20 @@ struct net_device_path { | @@ -862,10 +862,20 @@ struct net_device_path { | ||||||
|  			u16		id; |  			u16		id; | ||||||
|  			__be16		proto; |  			__be16		proto; | ||||||
|  		} encap; |  		} encap; | ||||||
| @@ -36,7 +36,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|   |   | ||||||
|  struct net_device_path_stack { |  struct net_device_path_stack { | ||||||
|  	int			num_paths; |  	int			num_paths; | ||||||
| @@ -868,6 +878,12 @@ struct net_device_path_stack { | @@ -875,6 +885,12 @@ struct net_device_path_stack { | ||||||
|  struct net_device_path_ctx { |  struct net_device_path_ctx { | ||||||
|  	const struct net_device *dev; |  	const struct net_device *dev; | ||||||
|  	const u8		*daddr; |  	const u8		*daddr; | ||||||
|   | |||||||
| @@ -83,7 +83,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  static int pppoe_recvmsg(struct socket *sock, struct msghdr *m, |  static int pppoe_recvmsg(struct socket *sock, struct msghdr *m, | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -845,6 +845,7 @@ enum net_device_path_type { | @@ -852,6 +852,7 @@ enum net_device_path_type { | ||||||
|  	DEV_PATH_ETHERNET = 0, |  	DEV_PATH_ETHERNET = 0, | ||||||
|  	DEV_PATH_VLAN, |  	DEV_PATH_VLAN, | ||||||
|  	DEV_PATH_BRIDGE, |  	DEV_PATH_BRIDGE, | ||||||
| @@ -91,7 +91,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  struct net_device_path { |  struct net_device_path { | ||||||
| @@ -854,6 +855,7 @@ struct net_device_path { | @@ -861,6 +862,7 @@ struct net_device_path { | ||||||
|  		struct { |  		struct { | ||||||
|  			u16		id; |  			u16		id; | ||||||
|  			__be16		proto; |  			__be16		proto; | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -846,6 +846,7 @@ enum net_device_path_type { | @@ -853,6 +853,7 @@ enum net_device_path_type { | ||||||
|  	DEV_PATH_VLAN, |  	DEV_PATH_VLAN, | ||||||
|  	DEV_PATH_BRIDGE, |  	DEV_PATH_BRIDGE, | ||||||
|  	DEV_PATH_PPPOE, |  	DEV_PATH_PPPOE, | ||||||
| @@ -18,7 +18,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  struct net_device_path { |  struct net_device_path { | ||||||
| @@ -866,6 +867,10 @@ struct net_device_path { | @@ -873,6 +874,10 @@ struct net_device_path { | ||||||
|  			u16		vlan_id; |  			u16		vlan_id; | ||||||
|  			__be16		vlan_proto; |  			__be16		vlan_proto; | ||||||
|  		} bridge; |  		} bridge; | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -863,6 +863,7 @@ struct net_device_path { | @@ -870,6 +870,7 @@ struct net_device_path { | ||||||
|  				DEV_PATH_BR_VLAN_KEEP, |  				DEV_PATH_BR_VLAN_KEEP, | ||||||
|  				DEV_PATH_BR_VLAN_TAG, |  				DEV_PATH_BR_VLAN_TAG, | ||||||
|  				DEV_PATH_BR_VLAN_UNTAG, |  				DEV_PATH_BR_VLAN_UNTAG, | ||||||
|   | |||||||
| @@ -77,7 +77,7 @@ Signed-off-by: Guenter Roeck <linux@roeck-us.net> | |||||||
| +======================= ===================================================================== | +======================= ===================================================================== | ||||||
| --- a/drivers/hwmon/Kconfig | --- a/drivers/hwmon/Kconfig | ||||||
| +++ b/drivers/hwmon/Kconfig | +++ b/drivers/hwmon/Kconfig | ||||||
| @@ -1102,6 +1102,17 @@ config SENSORS_TC654 | @@ -1103,6 +1103,17 @@ config SENSORS_TC654 | ||||||
|  	  This driver can also be built as a module. If so, the module |  	  This driver can also be built as a module. If so, the module | ||||||
|  	  will be called tc654. |  	  will be called tc654. | ||||||
|   |   | ||||||
|   | |||||||
| @@ -38,7 +38,7 @@ Signed-off-by: Lech Perczak <lech.perczak@gmail.com> | |||||||
|  |  | ||||||
| --- a/drivers/net/usb/rndis_host.c | --- a/drivers/net/usb/rndis_host.c | ||||||
| +++ b/drivers/net/usb/rndis_host.c | +++ b/drivers/net/usb/rndis_host.c | ||||||
| @@ -485,10 +485,14 @@ EXPORT_SYMBOL_GPL(rndis_unbind); | @@ -486,10 +486,14 @@ EXPORT_SYMBOL_GPL(rndis_unbind); | ||||||
|   */ |   */ | ||||||
|  int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb) |  int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb) | ||||||
|  { |  { | ||||||
| @@ -53,7 +53,7 @@ Signed-off-by: Lech Perczak <lech.perczak@gmail.com> | |||||||
|  	/* peripheral may have batched packets to us... */ |  	/* peripheral may have batched packets to us... */ | ||||||
|  	while (likely(skb->len)) { |  	while (likely(skb->len)) { | ||||||
|  		struct rndis_data_hdr	*hdr = (void *)skb->data; |  		struct rndis_data_hdr	*hdr = (void *)skb->data; | ||||||
| @@ -523,10 +527,17 @@ int rndis_rx_fixup(struct usbnet *dev, s | @@ -524,10 +528,17 @@ int rndis_rx_fixup(struct usbnet *dev, s | ||||||
|  			break; |  			break; | ||||||
|  		skb_pull(skb, msg_len - sizeof *hdr); |  		skb_pull(skb, msg_len - sizeof *hdr); | ||||||
|  		skb_trim(skb2, data_len); |  		skb_trim(skb2, data_len); | ||||||
| @@ -71,7 +71,7 @@ Signed-off-by: Lech Perczak <lech.perczak@gmail.com> | |||||||
|  	return 1; |  	return 1; | ||||||
|  } |  } | ||||||
|  EXPORT_SYMBOL_GPL(rndis_rx_fixup); |  EXPORT_SYMBOL_GPL(rndis_rx_fixup); | ||||||
| @@ -600,6 +611,17 @@ static const struct driver_info	rndis_po | @@ -601,6 +612,17 @@ static const struct driver_info	rndis_po | ||||||
|  	.tx_fixup =	rndis_tx_fixup, |  	.tx_fixup =	rndis_tx_fixup, | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -89,7 +89,7 @@ Signed-off-by: Lech Perczak <lech.perczak@gmail.com> | |||||||
|  /*-------------------------------------------------------------------------*/ |  /*-------------------------------------------------------------------------*/ | ||||||
|   |   | ||||||
|  static const struct usb_device_id	products [] = { |  static const struct usb_device_id	products [] = { | ||||||
| @@ -609,6 +631,16 @@ static const struct usb_device_id	produc | @@ -610,6 +632,16 @@ static const struct usb_device_id	produc | ||||||
|  				      USB_CLASS_COMM, 2 /* ACM */, 0x0ff), |  				      USB_CLASS_COMM, 2 /* ACM */, 0x0ff), | ||||||
|  	.driver_info = (unsigned long) &rndis_poll_status_info, |  	.driver_info = (unsigned long) &rndis_poll_status_info, | ||||||
|  }, { |  }, { | ||||||
|   | |||||||
| @@ -23,7 +23,7 @@ Signed-off-by: Lech Perczak <lech.perczak@gmail.com> | |||||||
|  |  | ||||||
| --- a/drivers/net/usb/rndis_host.c | --- a/drivers/net/usb/rndis_host.c | ||||||
| +++ b/drivers/net/usb/rndis_host.c | +++ b/drivers/net/usb/rndis_host.c | ||||||
| @@ -418,10 +418,7 @@ generic_rndis_bind(struct usbnet *dev, s | @@ -419,10 +419,7 @@ generic_rndis_bind(struct usbnet *dev, s | ||||||
|  		goto halt_fail_and_release; |  		goto halt_fail_and_release; | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
| @@ -35,7 +35,7 @@ Signed-off-by: Lech Perczak <lech.perczak@gmail.com> | |||||||
|   |   | ||||||
|  	/* set a nonzero filter to enable data transfers */ |  	/* set a nonzero filter to enable data transfers */ | ||||||
|  	memset(u.set, 0, sizeof *u.set); |  	memset(u.set, 0, sizeof *u.set); | ||||||
| @@ -463,6 +460,16 @@ static int rndis_bind(struct usbnet *dev | @@ -464,6 +461,16 @@ static int rndis_bind(struct usbnet *dev | ||||||
|  	return generic_rndis_bind(dev, intf, FLAG_RNDIS_PHYM_NOT_WIRELESS); |  	return generic_rndis_bind(dev, intf, FLAG_RNDIS_PHYM_NOT_WIRELESS); | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -52,7 +52,7 @@ Signed-off-by: Lech Perczak <lech.perczak@gmail.com> | |||||||
|  void rndis_unbind(struct usbnet *dev, struct usb_interface *intf) |  void rndis_unbind(struct usbnet *dev, struct usb_interface *intf) | ||||||
|  { |  { | ||||||
|  	struct rndis_halt	*halt; |  	struct rndis_halt	*halt; | ||||||
| @@ -615,7 +622,7 @@ static const struct driver_info	zte_rndi | @@ -616,7 +623,7 @@ static const struct driver_info	zte_rndi | ||||||
|  	.description =	"ZTE RNDIS device", |  	.description =	"ZTE RNDIS device", | ||||||
|  	.flags =	FLAG_ETHER | FLAG_POINTTOPOINT | FLAG_FRAMING_RN | FLAG_NO_SETINT, |  	.flags =	FLAG_ETHER | FLAG_POINTTOPOINT | FLAG_FRAMING_RN | FLAG_NO_SETINT, | ||||||
|  	.data =		RNDIS_DRIVER_DATA_DST_MAC_FIXUP, |  	.data =		RNDIS_DRIVER_DATA_DST_MAC_FIXUP, | ||||||
|   | |||||||
| @@ -77,7 +77,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> | |||||||
|   |   | ||||||
|  #include "mtdcore.h" |  #include "mtdcore.h" | ||||||
|   |   | ||||||
| @@ -928,6 +929,8 @@ int mtd_device_parse_register(struct mtd | @@ -930,6 +931,8 @@ int mtd_device_parse_register(struct mtd | ||||||
|  		register_reboot_notifier(&mtd->reboot_notifier); |  		register_reboot_notifier(&mtd->reboot_notifier); | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | |||||||
|  |  | ||||||
| --- a/drivers/mtd/mtdcore.c | --- a/drivers/mtd/mtdcore.c | ||||||
| +++ b/drivers/mtd/mtdcore.c | +++ b/drivers/mtd/mtdcore.c | ||||||
| @@ -756,7 +756,8 @@ int add_mtd_device(struct mtd_info *mtd) | @@ -758,7 +758,8 @@ int add_mtd_device(struct mtd_info *mtd) | ||||||
|   |   | ||||||
|  	mutex_unlock(&mtd_table_mutex); |  	mutex_unlock(&mtd_table_mutex); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ Fix assumption about the block device index | |||||||
|  |  | ||||||
| --- a/drivers/mtd/mtdcore.c | --- a/drivers/mtd/mtdcore.c | ||||||
| +++ b/drivers/mtd/mtdcore.c | +++ b/drivers/mtd/mtdcore.c | ||||||
| @@ -758,12 +758,18 @@ int add_mtd_device(struct mtd_info *mtd) | @@ -760,12 +760,18 @@ int add_mtd_device(struct mtd_info *mtd) | ||||||
|   |   | ||||||
|  	if (of_find_property(mtd_get_of_node(mtd), "linux,rootfs", NULL) || |  	if (of_find_property(mtd_get_of_node(mtd), "linux,rootfs", NULL) || | ||||||
|  	    (IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) && !strcmp(mtd->name, "rootfs") && ROOT_DEV == 0)) { |  	    (IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) && !strcmp(mtd->name, "rootfs") && ROOT_DEV == 0)) { | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -1639,6 +1639,7 @@ enum netdev_priv_flags { | @@ -1646,6 +1646,7 @@ enum netdev_priv_flags { | ||||||
|  	IFF_FAILOVER_SLAVE		= 1<<28, |  	IFF_FAILOVER_SLAVE		= 1<<28, | ||||||
|  	IFF_L3MDEV_RX_HANDLER		= 1<<29, |  	IFF_L3MDEV_RX_HANDLER		= 1<<29, | ||||||
|  	IFF_LIVE_RENAME_OK		= 1<<30, |  	IFF_LIVE_RENAME_OK		= 1<<30, | ||||||
| @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  #define IFF_802_1Q_VLAN			IFF_802_1Q_VLAN |  #define IFF_802_1Q_VLAN			IFF_802_1Q_VLAN | ||||||
| @@ -1671,6 +1672,7 @@ enum netdev_priv_flags { | @@ -1678,6 +1679,7 @@ enum netdev_priv_flags { | ||||||
|  #define IFF_FAILOVER_SLAVE		IFF_FAILOVER_SLAVE |  #define IFF_FAILOVER_SLAVE		IFF_FAILOVER_SLAVE | ||||||
|  #define IFF_L3MDEV_RX_HANDLER		IFF_L3MDEV_RX_HANDLER |  #define IFF_L3MDEV_RX_HANDLER		IFF_L3MDEV_RX_HANDLER | ||||||
|  #define IFF_LIVE_RENAME_OK		IFF_LIVE_RENAME_OK |  #define IFF_LIVE_RENAME_OK		IFF_LIVE_RENAME_OK | ||||||
| @@ -35,7 +35,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|   |   | ||||||
|  /* Specifies the type of the struct net_device::ml_priv pointer */ |  /* Specifies the type of the struct net_device::ml_priv pointer */ | ||||||
|  enum netdev_ml_priv_type { |  enum netdev_ml_priv_type { | ||||||
| @@ -2011,6 +2013,11 @@ struct net_device { | @@ -2018,6 +2020,11 @@ struct net_device { | ||||||
|  	const struct tlsdev_ops *tlsdev_ops; |  	const struct tlsdev_ops *tlsdev_ops; | ||||||
|  #endif |  #endif | ||||||
|   |   | ||||||
| @@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  	const struct header_ops *header_ops; |  	const struct header_ops *header_ops; | ||||||
|   |   | ||||||
|  	unsigned int		flags; |  	unsigned int		flags; | ||||||
| @@ -2101,6 +2108,10 @@ struct net_device { | @@ -2108,6 +2115,10 @@ struct net_device { | ||||||
|  	struct mpls_dev __rcu	*mpls_ptr; |  	struct mpls_dev __rcu	*mpls_ptr; | ||||||
|  #endif |  #endif | ||||||
|   |   | ||||||
| @@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|   */ |   */ | ||||||
| --- a/include/linux/skbuff.h | --- a/include/linux/skbuff.h | ||||||
| +++ b/include/linux/skbuff.h | +++ b/include/linux/skbuff.h | ||||||
| @@ -2720,6 +2720,10 @@ static inline int pskb_trim(struct sk_bu | @@ -2725,6 +2725,10 @@ static inline int pskb_trim(struct sk_bu | ||||||
|  	return (len < skb->len) ? __pskb_trim(skb, len) : 0; |  	return (len < skb->len) ? __pskb_trim(skb, len) : 0; | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  /** |  /** | ||||||
|   *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer |   *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer | ||||||
|   *	@skb: buffer to alter |   *	@skb: buffer to alter | ||||||
| @@ -2851,16 +2855,6 @@ static inline struct sk_buff *dev_alloc_ | @@ -2856,16 +2860,6 @@ static inline struct sk_buff *dev_alloc_ | ||||||
|  } |  } | ||||||
|   |   | ||||||
|   |   | ||||||
|   | |||||||
| @@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  |  | ||||||
| --- a/fs/locks.c | --- a/fs/locks.c | ||||||
| +++ b/fs/locks.c | +++ b/fs/locks.c | ||||||
| @@ -2993,6 +2993,8 @@ static const struct seq_operations locks | @@ -3016,6 +3016,8 @@ static const struct seq_operations locks | ||||||
|   |   | ||||||
|  static int __init proc_locks_init(void) |  static int __init proc_locks_init(void) | ||||||
|  { |  { | ||||||
|   | |||||||
| @@ -1,19 +0,0 @@ | |||||||
| From: Felix Fietkau <nbd@nbd.name> |  | ||||||
| Subject: uapi: Fix an issue with kernel headers that broke perf |  | ||||||
|  |  | ||||||
| Submitted-by: Felix Fietkau <nbd@nbd.name> |  | ||||||
| --- |  | ||||||
|  include/uapi/linux/swab.h                             | 2 +- |  | ||||||
|  1 file changed, 1 insertion(+), 1 deletion(-) |  | ||||||
|  |  | ||||||
| --- a/include/uapi/linux/swab.h |  | ||||||
| +++ b/include/uapi/linux/swab.h |  | ||||||
| @@ -3,7 +3,7 @@ |  | ||||||
|  #define _UAPI_LINUX_SWAB_H |  | ||||||
|   |  | ||||||
|  #include <linux/types.h> |  | ||||||
| -#include <linux/compiler.h> |  | ||||||
| +#include <linux/stddef.h> |  | ||||||
|  #include <asm/bitsperlong.h> |  | ||||||
|  #include <asm/swab.h> |  | ||||||
|   |  | ||||||
| @@ -11,7 +11,7 @@ Signed-off-by: Vincent Tremblay <vincent@vtremblay.dev> | |||||||
|  |  | ||||||
| --- a/drivers/spi/spidev.c | --- a/drivers/spi/spidev.c | ||||||
| +++ b/drivers/spi/spidev.c | +++ b/drivers/spi/spidev.c | ||||||
| @@ -682,6 +682,7 @@ static const struct of_device_id spidev_ | @@ -693,6 +693,7 @@ static const struct of_device_id spidev_ | ||||||
|  	{ .compatible = "lwn,bk4" }, |  	{ .compatible = "lwn,bk4" }, | ||||||
|  	{ .compatible = "dh,dhcom-board" }, |  	{ .compatible = "dh,dhcom-board" }, | ||||||
|  	{ .compatible = "menlo,m53cpld" }, |  	{ .compatible = "menlo,m53cpld" }, | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ Signed-off-by: Vincent Tremblay <vincent@vtremblay.dev> | |||||||
|  |  | ||||||
| --- a/drivers/spi/spidev.c | --- a/drivers/spi/spidev.c | ||||||
| +++ b/drivers/spi/spidev.c | +++ b/drivers/spi/spidev.c | ||||||
| @@ -683,6 +683,7 @@ static const struct of_device_id spidev_ | @@ -694,6 +694,7 @@ static const struct of_device_id spidev_ | ||||||
|  	{ .compatible = "dh,dhcom-board" }, |  	{ .compatible = "dh,dhcom-board" }, | ||||||
|  	{ .compatible = "menlo,m53cpld" }, |  	{ .compatible = "menlo,m53cpld" }, | ||||||
|  	{ .compatible = "silabs,em3581" }, |  	{ .compatible = "silabs,em3581" }, | ||||||
|   | |||||||
| @@ -202,7 +202,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> | |||||||
|  	return !!nor->params->erase_map.uniform_erase_type; |  	return !!nor->params->erase_map.uniform_erase_type; | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -2569,6 +2571,7 @@ static int spi_nor_select_erase(struct s | @@ -2571,6 +2573,7 @@ static int spi_nor_select_erase(struct s | ||||||
|  { |  { | ||||||
|  	struct spi_nor_erase_map *map = &nor->params->erase_map; |  	struct spi_nor_erase_map *map = &nor->params->erase_map; | ||||||
|  	const struct spi_nor_erase_type *erase = NULL; |  	const struct spi_nor_erase_type *erase = NULL; | ||||||
| @@ -210,7 +210,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> | |||||||
|  	struct mtd_info *mtd = &nor->mtd; |  	struct mtd_info *mtd = &nor->mtd; | ||||||
|  	u32 wanted_size = nor->info->sector_size; |  	u32 wanted_size = nor->info->sector_size; | ||||||
|  	int i; |  	int i; | ||||||
| @@ -2601,8 +2604,9 @@ static int spi_nor_select_erase(struct s | @@ -2603,8 +2606,9 @@ static int spi_nor_select_erase(struct s | ||||||
|  	 */ |  	 */ | ||||||
|  	for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) { |  	for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) { | ||||||
|  		if (map->erase_type[i].size) { |  		if (map->erase_type[i].size) { | ||||||
| @@ -222,7 +222,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> | |||||||
|  		} |  		} | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
| @@ -2610,6 +2614,9 @@ static int spi_nor_select_erase(struct s | @@ -2612,6 +2616,9 @@ static int spi_nor_select_erase(struct s | ||||||
|  		return -EINVAL; |  		return -EINVAL; | ||||||
|   |   | ||||||
|  	mtd->erasesize = erase->size; |  	mtd->erasesize = erase->size; | ||||||
|   | |||||||
| @@ -59,7 +59,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
| +}; | +}; | ||||||
| --- a/drivers/mtd/spi-nor/core.c | --- a/drivers/mtd/spi-nor/core.c | ||||||
| +++ b/drivers/mtd/spi-nor/core.c | +++ b/drivers/mtd/spi-nor/core.c | ||||||
| @@ -2037,6 +2037,7 @@ static const struct spi_nor_manufacturer | @@ -2039,6 +2039,7 @@ static const struct spi_nor_manufacturer | ||||||
|  	&spi_nor_winbond, |  	&spi_nor_winbond, | ||||||
|  	&spi_nor_xilinx, |  	&spi_nor_xilinx, | ||||||
|  	&spi_nor_xmc, |  	&spi_nor_xmc, | ||||||
|   | |||||||
| @@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  		goto out; |  		goto out; | ||||||
|   |   | ||||||
|  	if (!net_eq(dev_net(dev), sock_net(sk))) |  	if (!net_eq(dev_net(dev), sock_net(sk))) | ||||||
| @@ -2079,12 +2081,12 @@ static int packet_rcv(struct sk_buff *sk | @@ -2089,12 +2091,12 @@ static int packet_rcv(struct sk_buff *sk | ||||||
|  	unsigned int snaplen, res; |  	unsigned int snaplen, res; | ||||||
|  	bool is_drop_n_account = false; |  	bool is_drop_n_account = false; | ||||||
|   |   | ||||||
| @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  	if (!net_eq(dev_net(dev), sock_net(sk))) |  	if (!net_eq(dev_net(dev), sock_net(sk))) | ||||||
|  		goto drop; |  		goto drop; | ||||||
|   |   | ||||||
| @@ -2210,12 +2212,12 @@ static int tpacket_rcv(struct sk_buff *s | @@ -2220,12 +2222,12 @@ static int tpacket_rcv(struct sk_buff *s | ||||||
|  	BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); |  	BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); | ||||||
|  	BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); |  	BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); | ||||||
|   |   | ||||||
| @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  	if (!net_eq(dev_net(dev), sock_net(sk))) |  	if (!net_eq(dev_net(dev), sock_net(sk))) | ||||||
|  		goto drop; |  		goto drop; | ||||||
|   |   | ||||||
| @@ -3329,6 +3331,7 @@ static int packet_create(struct net *net | @@ -3339,6 +3341,7 @@ static int packet_create(struct net *net | ||||||
|  	mutex_init(&po->pg_vec_lock); |  	mutex_init(&po->pg_vec_lock); | ||||||
|  	po->rollover = NULL; |  	po->rollover = NULL; | ||||||
|  	po->prot_hook.func = packet_rcv; |  	po->prot_hook.func = packet_rcv; | ||||||
| @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|   |   | ||||||
|  	if (sock->type == SOCK_PACKET) |  	if (sock->type == SOCK_PACKET) | ||||||
|  		po->prot_hook.func = packet_rcv_spkt; |  		po->prot_hook.func = packet_rcv_spkt; | ||||||
| @@ -3972,6 +3975,16 @@ packet_setsockopt(struct socket *sock, i | @@ -3982,6 +3985,16 @@ packet_setsockopt(struct socket *sock, i | ||||||
|  		po->xmit = val ? packet_direct_xmit : dev_queue_xmit; |  		po->xmit = val ? packet_direct_xmit : dev_queue_xmit; | ||||||
|  		return 0; |  		return 0; | ||||||
|  	} |  	} | ||||||
| @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  	default: |  	default: | ||||||
|  		return -ENOPROTOOPT; |  		return -ENOPROTOOPT; | ||||||
|  	} |  	} | ||||||
| @@ -4028,6 +4041,13 @@ static int packet_getsockopt(struct sock | @@ -4038,6 +4051,13 @@ static int packet_getsockopt(struct sock | ||||||
|  	case PACKET_VNET_HDR: |  	case PACKET_VNET_HDR: | ||||||
|  		val = po->has_vnet_hdr; |  		val = po->has_vnet_hdr; | ||||||
|  		break; |  		break; | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  |  | ||||||
| --- a/include/linux/skbuff.h | --- a/include/linux/skbuff.h | ||||||
| +++ b/include/linux/skbuff.h | +++ b/include/linux/skbuff.h | ||||||
| @@ -2686,7 +2686,7 @@ static inline int pskb_network_may_pull( | @@ -2691,7 +2691,7 @@ static inline int pskb_network_may_pull( | ||||||
|   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) |   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) | ||||||
|   */ |   */ | ||||||
|  #ifndef NET_SKB_PAD |  #ifndef NET_SKB_PAD | ||||||
|   | |||||||
| @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -2050,6 +2050,8 @@ struct net_device { | @@ -2057,6 +2057,8 @@ struct net_device { | ||||||
|  	struct netdev_hw_addr_list	mc; |  	struct netdev_hw_addr_list	mc; | ||||||
|  	struct netdev_hw_addr_list	dev_addrs; |  	struct netdev_hw_addr_list	dev_addrs; | ||||||
|   |   | ||||||
| @@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  #endif |  #endif | ||||||
| --- a/include/linux/skbuff.h | --- a/include/linux/skbuff.h | ||||||
| +++ b/include/linux/skbuff.h | +++ b/include/linux/skbuff.h | ||||||
| @@ -860,6 +860,7 @@ struct sk_buff { | @@ -861,6 +861,7 @@ struct sk_buff { | ||||||
|  	__u8			decrypted:1; |  	__u8			decrypted:1; | ||||||
|  #endif |  #endif | ||||||
|  	__u8			scm_io_uring:1; |  	__u8			scm_io_uring:1; | ||||||
|   | |||||||
| @@ -233,7 +233,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  static inline void |  static inline void | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -847,6 +847,7 @@ enum net_device_path_type { | @@ -854,6 +854,7 @@ enum net_device_path_type { | ||||||
|  	DEV_PATH_BRIDGE, |  	DEV_PATH_BRIDGE, | ||||||
|  	DEV_PATH_PPPOE, |  	DEV_PATH_PPPOE, | ||||||
|  	DEV_PATH_DSA, |  	DEV_PATH_DSA, | ||||||
| @@ -241,7 +241,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  struct net_device_path { |  struct net_device_path { | ||||||
| @@ -872,6 +873,12 @@ struct net_device_path { | @@ -879,6 +880,12 @@ struct net_device_path { | ||||||
|  			int port; |  			int port; | ||||||
|  			u16 proto; |  			u16 proto; | ||||||
|  		} dsa; |  		} dsa; | ||||||
|   | |||||||
| @@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|   |   | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -892,7 +892,7 @@ struct net_device_path_stack { | @@ -899,7 +899,7 @@ struct net_device_path_stack { | ||||||
|   |   | ||||||
|  struct net_device_path_ctx { |  struct net_device_path_ctx { | ||||||
|  	const struct net_device *dev; |  	const struct net_device *dev; | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ Subject: SoC: add qualcomm syscon | |||||||
|  obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o |  obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o | ||||||
| --- a/drivers/soc/qcom/Kconfig | --- a/drivers/soc/qcom/Kconfig | ||||||
| +++ b/drivers/soc/qcom/Kconfig | +++ b/drivers/soc/qcom/Kconfig | ||||||
| @@ -190,6 +190,13 @@ config QCOM_SOCINFO | @@ -191,6 +191,13 @@ config QCOM_SOCINFO | ||||||
|  	 Say yes here to support the Qualcomm socinfo driver, providing |  	 Say yes here to support the Qualcomm socinfo driver, providing | ||||||
|  	 information about the SoC to user space. |  	 information about the SoC to user space. | ||||||
|   |   | ||||||
|   | |||||||
| @@ -39,7 +39,7 @@ | |||||||
|   |   | ||||||
|  	/* check we are the Master VPE */ |  	/* check we are the Master VPE */ | ||||||
|  	local_irq_save(flags); |  	local_irq_save(flags); | ||||||
| @@ -417,6 +418,8 @@ int __init vpe_module_init(void) | @@ -416,6 +417,8 @@ int __init vpe_module_init(void) | ||||||
|  			} |  			} | ||||||
|   |   | ||||||
|  			v->ntcs = hw_tcs - aprp_cpu_index(); |  			v->ntcs = hw_tcs - aprp_cpu_index(); | ||||||
|   | |||||||
| @@ -28,7 +28,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| @@ -84,12 +84,23 @@ | @@ -90,12 +90,23 @@ | ||||||
|  	}; |  	}; | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -52,7 +52,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | |||||||
|   |   | ||||||
|  	fixed-link { |  	fixed-link { | ||||||
|  		speed = <1000>; |  		speed = <1000>; | ||||||
| @@ -103,6 +114,9 @@ | @@ -109,6 +120,9 @@ | ||||||
|  	pinctrl-0 = <&ge1_rgmii_pins>; |  	pinctrl-0 = <&ge1_rgmii_pins>; | ||||||
|  	status = "okay"; |  	status = "okay"; | ||||||
|  	phy-mode = "rgmii"; |  	phy-mode = "rgmii"; | ||||||
| @@ -62,7 +62,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | |||||||
|   |   | ||||||
|  	fixed-link { |  	fixed-link { | ||||||
|  		speed = <1000>; |  		speed = <1000>; | ||||||
| @@ -115,6 +129,9 @@ | @@ -121,6 +135,9 @@ | ||||||
|  	status = "okay"; |  	status = "okay"; | ||||||
|  	phy-mode = "sgmii"; |  	phy-mode = "sgmii"; | ||||||
|  	phy = <&phy1>; |  	phy = <&phy1>; | ||||||
|   | |||||||
| @@ -27,7 +27,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| @@ -129,6 +129,7 @@ | @@ -135,6 +135,7 @@ | ||||||
|  	status = "okay"; |  	status = "okay"; | ||||||
|  	phy-mode = "sgmii"; |  	phy-mode = "sgmii"; | ||||||
|  	phy = <&phy1>; |  	phy = <&phy1>; | ||||||
|   | |||||||
| @@ -27,7 +27,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| @@ -261,13 +261,18 @@ | @@ -267,13 +267,18 @@ | ||||||
|   |   | ||||||
|  	/* Switch MV88E6176 at address 0x10 */ |  	/* Switch MV88E6176 at address 0x10 */ | ||||||
|  	switch@10 { |  	switch@10 { | ||||||
| @@ -47,7 +47,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | |||||||
|  		ports { |  		ports { | ||||||
|  			#address-cells = <1>; |  			#address-cells = <1>; | ||||||
|  			#size-cells = <0>; |  			#size-cells = <0>; | ||||||
| @@ -320,6 +325,11 @@ | @@ -336,6 +341,11 @@ | ||||||
|  		marvell,function = "gpio"; |  		marvell,function = "gpio"; | ||||||
|  	}; |  	}; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -33,7 +33,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| @@ -82,6 +82,24 @@ | @@ -88,6 +88,24 @@ | ||||||
|  			}; |  			}; | ||||||
|  		}; |  		}; | ||||||
|  	}; |  	}; | ||||||
| @@ -58,7 +58,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  &bm { |  &bm { | ||||||
| @@ -126,10 +144,20 @@ | @@ -132,10 +150,20 @@ | ||||||
|   |   | ||||||
|  /* WAN port */ |  /* WAN port */ | ||||||
|  ð2 { |  ð2 { | ||||||
| @@ -79,7 +79,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | |||||||
|  	buffer-manager = <&bm>; |  	buffer-manager = <&bm>; | ||||||
|  	bm,pool-long = <2>; |  	bm,pool-long = <2>; | ||||||
|  	bm,pool-short = <3>; |  	bm,pool-short = <3>; | ||||||
| @@ -195,7 +223,7 @@ | @@ -201,7 +229,7 @@ | ||||||
|  			/* routed to PCIe2 connector (CN62A) */ |  			/* routed to PCIe2 connector (CN62A) */ | ||||||
|  		}; |  		}; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -41,7 +41,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | |||||||
|  #include "armada-385.dtsi" |  #include "armada-385.dtsi" | ||||||
|   |   | ||||||
|  / { |  / { | ||||||
| @@ -181,7 +182,115 @@ | @@ -187,7 +188,115 @@ | ||||||
|  			reg = <0>; |  			reg = <0>; | ||||||
|   |   | ||||||
|  			/* STM32F0 command interface at address 0x2a */ |  			/* STM32F0 command interface at address 0x2a */ | ||||||
|   | |||||||
| @@ -29,7 +29,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| @@ -156,7 +156,7 @@ | @@ -162,7 +162,7 @@ | ||||||
|  	 */ |  	 */ | ||||||
|  	status = "okay"; |  	status = "okay"; | ||||||
|  	phy-mode = "sgmii"; |  	phy-mode = "sgmii"; | ||||||
| @@ -38,7 +38,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | |||||||
|  	phys = <&comphy5 2>; |  	phys = <&comphy5 2>; | ||||||
|  	sfp = <&sfp>; |  	sfp = <&sfp>; | ||||||
|  	buffer-manager = <&bm>; |  	buffer-manager = <&bm>; | ||||||
| @@ -387,9 +387,9 @@ | @@ -393,9 +393,9 @@ | ||||||
|  	pinctrl-0 = <&mdio_pins>; |  	pinctrl-0 = <&mdio_pins>; | ||||||
|  	status = "okay"; |  	status = "okay"; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -21,7 +21,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| @@ -32,7 +32,8 @@ | @@ -38,7 +38,8 @@ | ||||||
|  		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000 |  		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000 | ||||||
|  			  MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000 |  			  MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000 | ||||||
|  			  MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000 |  			  MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000 | ||||||
|   | |||||||
| @@ -26,7 +26,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| @@ -392,7 +392,8 @@ | @@ -398,7 +398,8 @@ | ||||||
|  		status = "okay"; |  		status = "okay"; | ||||||
|  		compatible = "ethernet-phy-ieee802.3-c22"; |  		compatible = "ethernet-phy-ieee802.3-c22"; | ||||||
|  		reg = <1>; |  		reg = <1>; | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | ||||||
| @@ -189,15 +189,13 @@ | @@ -195,15 +195,13 @@ | ||||||
|  				reg = <0x2b>; |  				reg = <0x2b>; | ||||||
|  				#address-cells = <1>; |  				#address-cells = <1>; | ||||||
|  				#size-cells = <0>; |  				#size-cells = <0>; | ||||||
| @@ -38,7 +38,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org> | |||||||
|  				 * - there are 3 LEDs connected via MCU to PCIe |  				 * - there are 3 LEDs connected via MCU to PCIe | ||||||
|  				 *   ports. One of these ports supports mSATA. |  				 *   ports. One of these ports supports mSATA. | ||||||
|  				 *   There is no mSATA nor PCIe function. |  				 *   There is no mSATA nor PCIe function. | ||||||
| @@ -208,7 +206,6 @@ | @@ -214,7 +212,6 @@ | ||||||
|  				 *   B. Again there is no such function defined. |  				 *   B. Again there is no such function defined. | ||||||
|  				 *   For now we use LED_FUNCTION_INDICATOR |  				 *   For now we use LED_FUNCTION_INDICATOR | ||||||
|  				 */ |  				 */ | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com> | |||||||
|  |  | ||||||
| --- a/drivers/mtd/spi-nor/core.c | --- a/drivers/mtd/spi-nor/core.c | ||||||
| +++ b/drivers/mtd/spi-nor/core.c | +++ b/drivers/mtd/spi-nor/core.c | ||||||
| @@ -3141,6 +3141,7 @@ int spi_nor_scan(struct spi_nor *nor, co | @@ -3143,6 +3143,7 @@ int spi_nor_scan(struct spi_nor *nor, co | ||||||
|  	struct device *dev = nor->dev; |  	struct device *dev = nor->dev; | ||||||
|  	struct mtd_info *mtd = &nor->mtd; |  	struct mtd_info *mtd = &nor->mtd; | ||||||
|  	struct device_node *np = spi_nor_get_flash_node(nor); |  	struct device_node *np = spi_nor_get_flash_node(nor); | ||||||
| @@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com> | |||||||
|  	int ret; |  	int ret; | ||||||
|  	int i; |  	int i; | ||||||
|   |   | ||||||
| @@ -3195,7 +3196,12 @@ int spi_nor_scan(struct spi_nor *nor, co | @@ -3197,7 +3198,12 @@ int spi_nor_scan(struct spi_nor *nor, co | ||||||
|  	if (ret) |  	if (ret) | ||||||
|  		return ret; |  		return ret; | ||||||
|   |   | ||||||
| @@ -34,7 +34,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com> | |||||||
|  	mtd->type = MTD_NORFLASH; |  	mtd->type = MTD_NORFLASH; | ||||||
| --- a/drivers/mtd/mtdcore.c | --- a/drivers/mtd/mtdcore.c | ||||||
| +++ b/drivers/mtd/mtdcore.c | +++ b/drivers/mtd/mtdcore.c | ||||||
| @@ -848,6 +848,17 @@ out_error: | @@ -850,6 +850,17 @@ out_error: | ||||||
|   */ |   */ | ||||||
|  static void mtd_set_dev_defaults(struct mtd_info *mtd) |  static void mtd_set_dev_defaults(struct mtd_info *mtd) | ||||||
|  { |  { | ||||||
|   | |||||||
| @@ -55,7 +55,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> | |||||||
| +}; | +}; | ||||||
| --- a/drivers/mtd/spi-nor/core.c | --- a/drivers/mtd/spi-nor/core.c | ||||||
| +++ b/drivers/mtd/spi-nor/core.c | +++ b/drivers/mtd/spi-nor/core.c | ||||||
| @@ -2021,6 +2021,7 @@ int spi_nor_sr2_bit7_quad_enable(struct | @@ -2023,6 +2023,7 @@ int spi_nor_sr2_bit7_quad_enable(struct | ||||||
|   |   | ||||||
|  static const struct spi_nor_manufacturer *manufacturers[] = { |  static const struct spi_nor_manufacturer *manufacturers[] = { | ||||||
|  	&spi_nor_atmel, |  	&spi_nor_atmel, | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user