On Wed, Nov 2, 2016 at 4:45 PM, <p.wa...@gmx.at> wrote: >> I find it quite odd that it doesnt apply cleanly to my LEDE tree at git rev > > I've just gone throgh the changes, and there is definitely more than just > 'refreshing' the line numbers/offsets. This is seen at [1]. Have a special > look > at [2] at the bottom of this mail, the line containing the caiman target is > completely removed! This is not patch refreshing! > > Looking through the upstream changes 4.4.29->4.4.30 and the list of local > LEDE/OpenWrt patches, the only thing required for a bump to 4.4.30 is > the change in kernel-version.mk
I would also concur with this course, as I have done just that successfully. and have it now running on 4.4.30 :) Id be incline to ask for a resubmission, as this patch appears the be overkill and not appropriate > > Best regards, > P. Wassi > > [1] > Add a space in an empty line: >> diff --git >> a/target/linux/generic/patches-4.4/051-0002-ovl-override-creds-with-the-ones-from-the-superblock.patch >> >> b/target/linux/generic/patches-4.4/051-0002-ovl-override-creds-with-the-ones-from-the-superblock.patch >> index f985ff3..eed7bb2 100644 >> --- >> a/target/linux/generic/patches-4.4/051-0002-ovl-override-creds-with-the-ones-from-the-superblock.patch >> +++ >> b/target/linux/generic/patches-4.4/051-0002-ovl-override-creds-with-the-ones-from-the-superblock.patch >> @@ -105,7 +105,7 @@ Signed-off-by: Miklos Szeredi <mszeredi at redhat.com> >> -out_free_link: >> if (link) >> free_page((unsigned long) link); >> - >> + >> --- a/fs/overlayfs/dir.c >> +++ b/fs/overlayfs/dir.c >> @@ -408,28 +408,13 @@ static int ovl_create_or_link(struct den > Remove the file timestamp: >> diff --git >> a/target/linux/generic/patches-4.4/477-mtd-add-spi-nor-add-mx25u3235f.patch >> b/target/linux/generic/patches-4.4/477-mtd-add-spi-nor-add-mx25u3235f.patch >> index 45533e1..eb99b28 100644 >> --- >> a/target/linux/generic/patches-4.4/477-mtd-add-spi-nor-add-mx25u3235f.patch >> +++ >> b/target/linux/generic/patches-4.4/477-mtd-add-spi-nor-add-mx25u3235f.patch >> @@ -1,5 +1,5 @@ >> ---- a/drivers/mtd/spi-nor/spi-nor.c 2016-10-09 00:34:19.206155838 +0200 >> -+++ b/drivers/mtd/spi-nor/spi-nor.c 2016-10-09 00:37:11.048495602 +0200 >> +--- a/drivers/mtd/spi-nor/spi-nor.c >> ++++ b/drivers/mtd/spi-nor/spi-nor.c >> @@ -721,6 +721,7 @@ static const struct flash_info spi_nor_i >> { "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, SECT_4K) }, >> { "mx25l3255e", INFO(0xc29e16, 0, 64 * 1024, 64, SECT_4K) }, > Remove an empty line: >> diff --git a/target/linux/lantiq/patches-4.4/0153-lantiq-VPE-softdog.patch >> b/target/linux/lantiq/patches-4.4/0153-lantiq-VPE-softdog.patch >> index 2f5572a..eb76a24 100644 >> --- a/target/linux/lantiq/patches-4.4/0153-lantiq-VPE-softdog.patch >> +++ b/target/linux/lantiq/patches-4.4/0153-lantiq-VPE-softdog.patch >> @@ -157,7 +157,6 @@ >> +MODULE_AUTHOR("LXDB"); >> +MODULE_DESCRIPTION("Software Watchdog For VPE1"); >> +MODULE_LICENSE("GPL"); >> - >> --- a/arch/mips/lantiq/Makefile >> +++ b/arch/mips/lantiq/Makefile >> @@ -6,6 +6,8 @@ > > [2] >> diff --git >> a/target/linux/mvebu/patches-4.4/053-ARM-dts-Add-SolidRun-Armada-388-Clearfog-A1-DT-file.patch >> >> b/target/linux/mvebu/patches-4.4/053-ARM-dts-Add-SolidRun-Armada-388-Clearfog-A1-DT-file.patch >> index abf2a63..b25d710 100644 >> --- >> a/target/linux/mvebu/patches-4.4/053-ARM-dts-Add-SolidRun-Armada-388-Clearfog-A1-DT-file.patch >> +++ >> b/target/linux/mvebu/patches-4.4/053-ARM-dts-Add-SolidRun-Armada-388-Clearfog-A1-DT-file.patch >> @@ -24,9 +24,9 @@ Signed-off-by: Gregory CLEMENT <gregory.clement at >> free-electrons.com> >> >> --- a/arch/arm/boot/dts/Makefile >> +++ b/arch/arm/boot/dts/Makefile >> -@@ -749,6 +749,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ >> - armada-385-linksys-caiman.dtb \ >> +@@ -750,6 +750,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ >> armada-385-linksys-cobra.dtb \ >> + armada-385-linksys-rango.dtb \ >> armada-385-linksys-shelby.dtb \ >> + armada-388-clearfog.dtb \ >> armada-388-db.dtb \ _______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev