-LINUX_VERSION-5.10 = .115
-LINUX_KERNEL_HASH-5.10.115 = f5e417b32f89318b6d0a230109a592ffd68997817463dc4692fa49ec7fe42f71
+LINUX_VERSION-5.10 = .116
+LINUX_KERNEL_HASH-5.10.116 = 806692ba7436f9cfbc32709fe20097dbde4ae5e2f4ae582f39b1d91ce5d20b49
+++ /dev/null
-From a71658c7db0b2be9fcab3522aeabe11792a4f481 Mon Sep 17 00:00:00 2001
-From: Dmitry Osipenko <digetx@gmail.com>
-Date: Wed, 20 Jan 2021 23:58:44 +0300
-Subject: [PATCH] regulator: consumer: Add missing stubs to
- regulator/consumer.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 51dfb6ca3728bd0a0a3c23776a12d2a15a1d2457 upstream.
-
-Add missing stubs to regulator/consumer.h in order to fix COMPILE_TEST
-of the kernel. In particular this should fix compile-testing of OPP core
-because of a missing stub for regulator_sync_voltage().
-
-Reported-by: kernel test robot <lkp@intel.com>
-Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
-Link: https://lore.kernel.org/r/20210120205844.12658-1-digetx@gmail.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Cc: Bjørn Mork <bjorn@mork.no>
-Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- include/linux/regulator/consumer.h | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
---- a/include/linux/regulator/consumer.h
-+++ b/include/linux/regulator/consumer.h
-@@ -332,6 +332,12 @@ regulator_get_exclusive(struct device *d
- }
-
- static inline struct regulator *__must_check
-+devm_regulator_get_exclusive(struct device *dev, const char *id)
-+{
-+ return ERR_PTR(-ENODEV);
-+}
-+
-+static inline struct regulator *__must_check
- regulator_get_optional(struct device *dev, const char *id)
- {
- return ERR_PTR(-ENODEV);
-@@ -486,6 +492,11 @@ static inline int regulator_get_voltage(
- return -EINVAL;
- }
-
-+static inline int regulator_sync_voltage(struct regulator *regulator)
-+{
-+ return -EINVAL;
-+}
-+
- static inline int regulator_is_supported_voltage(struct regulator *regulator,
- int min_uV, int max_uV)
- {
-@@ -578,6 +589,25 @@ static inline int devm_regulator_unregis
- return 0;
- }
-
-+static inline int regulator_suspend_enable(struct regulator_dev *rdev,
-+ suspend_state_t state)
-+{
-+ return -EINVAL;
-+}
-+
-+static inline int regulator_suspend_disable(struct regulator_dev *rdev,
-+ suspend_state_t state)
-+{
-+ return -EINVAL;
-+}
-+
-+static inline int regulator_set_suspend_voltage(struct regulator *regulator,
-+ int min_uV, int max_uV,
-+ suspend_state_t state)
-+{
-+ return -EINVAL;
-+}
-+
- static inline void *regulator_get_drvdata(struct regulator *regulator)
- {
- return NULL;
&vmalloc_op,
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
-@@ -2044,10 +2044,12 @@ void __init init_mm_internals(void)
+@@ -2040,10 +2040,12 @@ void __init init_mm_internals(void)
start_shepherd_timer();
#endif
#ifdef CONFIG_PROC_FS
drivers/mtd/nand/raw/nand_ids.c | 3 +++
1 file changed, 3 insertions(+)
-diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c
-index 6e41902be35f..d64adbd1ce6b 100644
--- a/drivers/mtd/nand/raw/nand_ids.c
+++ b/drivers/mtd/nand/raw/nand_ids.c
-@@ -29,6 +29,9 @@ struct nand_flash_dev nand_flash_ids[] = {
+@@ -29,6 +29,9 @@ struct nand_flash_dev nand_flash_ids[] =
{"TC58NVG0S3E 1G 3.3V 8-bit",
{ .id = {0x98, 0xd1, 0x90, 0x15, 0x76, 0x14, 0x01, 0x00} },
SZ_2K, SZ_128, SZ_128K, 0, 8, 64, NAND_ECC_INFO(1, SZ_512), },
{"TC58NVG2S0F 4G 3.3V 8-bit",
{ .id = {0x98, 0xdc, 0x90, 0x26, 0x76, 0x15, 0x01, 0x08} },
SZ_4K, SZ_512, SZ_256K, 0, 8, 224, NAND_ECC_INFO(4, SZ_512) },
---
-2.35.1
-
/*
* This structure holds all XPS maps for device. Maps are indexed by CPU.
*/
-@@ -1445,6 +1455,9 @@ struct net_device_ops {
+@@ -1452,6 +1462,9 @@ struct net_device_ops {
const struct sk_buff *skb,
u16 rxq_index,
u32 flow_id);
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1781,6 +1781,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1777,6 +1777,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property.
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1794,6 +1794,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
+@@ -1790,6 +1790,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
endchoice
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1781,6 +1781,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1777,6 +1777,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property.
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1781,6 +1781,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1777,6 +1777,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property.
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -2949,6 +2949,7 @@ static const struct net_device_ops mtk_n
+@@ -2955,6 +2955,7 @@ static const struct net_device_ops mtk_n
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
{
const __be32 *_id = of_get_property(np, "reg", NULL);
phy_interface_t phy_mode;
struct phylink *phylink;
-@@ -3044,6 +3045,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3050,6 +3051,9 @@ static int mtk_add_mac(struct mtk_eth *e
else
eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH_2K - MTK_RX_ETH_HLEN;
projects / openwrt / staging / stintel.git / commitdiff