kernel: bump 4.4 to 4.4.119
This bumps the 4.4. kernel in master to 4.4.119. Includes more Meltdown & Spectre mitigation. * Refresh patches. * Refresh x86/config for RETPOLINE. * Deleted 8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch (accepted upstream) * Deleted 8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch (accepted upstream) * Deleted 650-pppoe_header_pad.patch (does not apply anymore (code was replaced)). Bumps from 4.4.112 to 4.4.115 were handled by Kevin Darbyshire-Bryant. Compile-tested on: ar71xx & oxnas. Signed-off-by: Stijn Segers <foss@volatilesystems.org> Tested-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
committed by
Hauke Mehrtens
parent
5af85dab22
commit
e72b2464b1
@@ -15,7 +15,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
||||
|
||||
--- a/drivers/mtd/nand/nand_base.c
|
||||
+++ b/drivers/mtd/nand/nand_base.c
|
||||
@@ -3992,6 +3992,9 @@ int nand_scan_ident(struct mtd_info *mtd
|
||||
@@ -3995,6 +3995,9 @@ int nand_scan_ident(struct mtd_info *mtd
|
||||
int ret;
|
||||
|
||||
if (chip->flash_node) {
|
||||
|
||||
@@ -28,7 +28,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
||||
|
||||
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
|
||||
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
|
||||
@@ -1957,7 +1957,7 @@ static int brcmnand_init_cs(struct brcmn
|
||||
@@ -1950,7 +1950,7 @@ static int brcmnand_init_cs(struct brcmn
|
||||
mtd = &host->mtd;
|
||||
chip = &host->chip;
|
||||
|
||||
@@ -50,7 +50,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
||||
nand->options |= NAND_BUSWIDTH_16;
|
||||
--- a/drivers/mtd/nand/sunxi_nand.c
|
||||
+++ b/drivers/mtd/nand/sunxi_nand.c
|
||||
@@ -1330,7 +1330,7 @@ static int sunxi_nand_chip_init(struct d
|
||||
@@ -1336,7 +1336,7 @@ static int sunxi_nand_chip_init(struct d
|
||||
* in the DT.
|
||||
*/
|
||||
nand->ecc.mode = NAND_ECC_HW;
|
||||
|
||||
@@ -83,7 +83,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
||||
|
||||
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
|
||||
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
|
||||
@@ -1946,7 +1946,6 @@ static int brcmnand_init_cs(struct brcmn
|
||||
@@ -1939,7 +1939,6 @@ static int brcmnand_init_cs(struct brcmn
|
||||
struct nand_chip *chip;
|
||||
int ret;
|
||||
u16 cfg_offs;
|
||||
@@ -91,7 +91,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
||||
|
||||
ret = of_property_read_u32(dn, "reg", &host->cs);
|
||||
if (ret) {
|
||||
@@ -2025,7 +2024,7 @@ static int brcmnand_init_cs(struct brcmn
|
||||
@@ -2018,7 +2017,7 @@ static int brcmnand_init_cs(struct brcmn
|
||||
if (nand_scan_tail(mtd))
|
||||
return -ENXIO;
|
||||
|
||||
@@ -610,7 +610,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
||||
|
||||
flctl = devm_kzalloc(&pdev->dev, sizeof(struct sh_flctl), GFP_KERNEL);
|
||||
if (!flctl)
|
||||
@@ -1123,6 +1122,7 @@ static int flctl_probe(struct platform_d
|
||||
@@ -1124,6 +1123,7 @@ static int flctl_probe(struct platform_d
|
||||
platform_set_drvdata(pdev, flctl);
|
||||
flctl_mtd = &flctl->mtd;
|
||||
nand = &flctl->chip;
|
||||
@@ -618,7 +618,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
||||
flctl_mtd->priv = nand;
|
||||
flctl_mtd->dev.parent = &pdev->dev;
|
||||
flctl->pdev = pdev;
|
||||
@@ -1163,9 +1163,7 @@ static int flctl_probe(struct platform_d
|
||||
@@ -1164,9 +1164,7 @@ static int flctl_probe(struct platform_d
|
||||
if (ret)
|
||||
goto err_chip;
|
||||
|
||||
@@ -662,7 +662,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
||||
|
||||
--- a/drivers/mtd/nand/sunxi_nand.c
|
||||
+++ b/drivers/mtd/nand/sunxi_nand.c
|
||||
@@ -1232,7 +1232,6 @@ static int sunxi_nand_chip_init(struct d
|
||||
@@ -1238,7 +1238,6 @@ static int sunxi_nand_chip_init(struct d
|
||||
{
|
||||
const struct nand_sdr_timings *timings;
|
||||
struct sunxi_nand_chip *chip;
|
||||
@@ -670,7 +670,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
||||
struct mtd_info *mtd;
|
||||
struct nand_chip *nand;
|
||||
int nsels;
|
||||
@@ -1366,8 +1365,7 @@ static int sunxi_nand_chip_init(struct d
|
||||
@@ -1372,8 +1371,7 @@ static int sunxi_nand_chip_init(struct d
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user