Hi, On Wed, Aug 5, 2015 at 12:53 AM, Daniel Golle <[email protected]> wrote: > Changelog: > * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.4 > > Signed-off-by: Daniel Golle <[email protected]> > --- > include/kernel-version.mk | 4 +- > ...79-add-gpio-func-register-for-QCA955x-SoC.patch | 2 +- > .../813-MIPS-ath79-add-ap147-support.patch | 6 +- > .../140-overlayfs_readdir_locking_fix.patch | 148 > --------------------- > .../generic/patches-4.1/834-ledtrig-libata.patch | 10 +- > 5 files changed, 11 insertions(+), 159 deletions(-) > delete mode 100644 > target/linux/generic/patches-4.1/140-overlayfs_readdir_locking_fix.patch > > diff --git a/include/kernel-version.mk b/include/kernel-version.mk > index e03590f..9f68716 100644 > --- a/include/kernel-version.mk > +++ b/include/kernel-version.mk > @@ -4,11 +4,11 @@ LINUX_RELEASE?=1 > > LINUX_VERSION-3.18 = .19 > LINUX_VERSION-4.0 = .9 > -LINUX_VERSION-4.1 = .3 > +LINUX_VERSION-4.1 = .4 > > LINUX_KERNEL_MD5SUM-3.18.19 = a143f9421bd8413752609d0d771c2955 > LINUX_KERNEL_MD5SUM-4.0.9 = 40fc5f6e2d718e539b45e6601c71985b > -LINUX_KERNEL_MD5SUM-4.1.3 = 96c2c77b1c54ba01cfd8fc2d13fbf828 > +LINUX_KERNEL_MD5SUM-4.1.4 = 32cb4dd9f14d37bf71bafa6ed368f769
this breaks at least brcm2708: Applying patch platform/0119-Merge-pull-request-1059-from-pelwell-rpi-4.0.y.patch patching file Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 patching file Documentation/w1/slaves/w1_therm patching file drivers/w1/slaves/w1_therm.c Hunk #1 FAILED at 59. Hunk #2 succeeded at 92 (offset 16 lines). Hunk #3 succeeded at 117 (offset 16 lines). Hunk #4 succeeded at 140 (offset 16 lines). Hunk #5 FAILED at 211. Hunk #6 FAILED at 247. Hunk #7 FAILED at 286. I will take a stab at fixing this up locally, but in the future please try to ensure that target patches still apply. Jonas _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
