W dniu 08.05.2018 o 15:54, Koen Vandeputte pisze: > > > On 2018-05-08 15:47, Michael Yartys wrote: >> The patch doesn't apply without changing what I've highlighted below. >> >> >> diff --git a/include/kernel-version.mk b/include/kernel-version.mk >> >> index 68795f767c04..192ee1c2e969 100644 >> >> --- a/include/kernel-version.mk >> >> +++ b/include/kernel-version.mk >> >> @@ -4,13 +4,13 @@ LINUX_RELEASE?=1 >> >> LINUX_VERSION-3.18 = .71 >> >> LINUX_VERSION-4.4 = .121 >> >> -LINUX_VERSION-4.14 = .37 >> >> LINUX_VERSION-4.9 = .98 >> >> +LINUX_VERSION-4.14 = .39 >> ^^^^^ Must be reordered so that 4.9 is above 4.14. Also, 4.9 is at .96 and >> not .98, which might also cause some issues. >>> LINUX_KERNEL_HASH-3.18.71 = >>> 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240 >>> >>> LINUX_KERNEL_HASH-4.4.121 = >>> 44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729 >>> >>> -LINUX_KERNEL_HASH-4.14.37 = >>> 8197e7ed3620713e412905430a7bf93e2048384042ffba189a66f0eeb6908e92 >>> >>> LINUX_KERNEL_HASH-4.9.98 = >>> 12cd90355adbc946e7e95aa5cdef2dd99b8e166cb64fe53a91c3e1d8f81810ef >>> >>> +LINUX_KERNEL_HASH-4.14.39 = >>> 269fc576ab0509e10c3b26e57866aea3f272c17f172f14fd75e2676d38c1b7bd >>> >> ^^^^^ The same here. Change hash if kernel 4.9.98 is also an issue. >>> remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) >>> >>> sanitize_uri=$(call qstrip,$(subst @,,$(subst :,,$(subst .,,$(subst >>> -,,$(subst /,_,$(1))))))) > Hi, > > As mentioned in the patch notes: > - Please apply the patch from Kevin DB first before applying this one > (kernel: bump 4.9 to 4.9.98)
It still doesn't apply after Kevin patch. Michael is right with "reordering" part. You also added refresh_kernel.sh to the tree. After cleaning the patch You can add my Tested-by, I tested it on mvebu/espressobin. > > > I'm doing this on purpose so it's easier for maintainers to just apply both > patches at once, without requiring any modification of the > include/kernel-version file > > > Koen > > _______________________________________________ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev Regards, Tomasz. -- TMN _______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev