[LEDE-DEV] [PATCH] kernel: update kernel 4.4 to version 4.4.30

[Hannu Nyman]

 > p.wassi at gmx.at wrote on Wed Nov 2 01:45:28 PDT 2016:
 > 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
 > ...
 > > --- 
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 \

Sorry, but are wrong. "refreshing patches" includes also refreshing the diff 
contexts lines as necessary. You have to be really careful when looking at 
patches that modify patches.

You have just highlighted a good example of that: the only change made by the 
original patch file itself is the line "armada-388-clearfog.dtb". Since a new 
context line "armada-385-linksys-rango.dtb" has been added into middle of the 
context (either in kernel source or by an earlier patch in the chain), the 
first diff context line "armada-385-linksys-caiman.dtb" is now unnecessary 
and is removed from the patch.

You need to look really carefully which lines start with a space before plus 
(part of the original patch, unmodified here) and which start with plus 
(meaning the line is chnaged by this patch).