Hi, [quilt version 0.65]
Summary: one file in a patch (lib/Makefile) is not part of the updated patch I'm trying to apply patch 4 (only; the rest aren't needed just to build lib/generic-radix-tree.c): https://lore.kernel.org/lkml/[email protected]/ include/linux/generic-radix-tree.h | 222 +++++++++++++++++++++++++++++ lib/Makefile | 3 +- lib/generic-radix-tree.c | 180 +++++++++++++++++++++++ 3 files changed, 404 insertions(+), 1 deletion(-) I'm applying the patch to linux-next-20180910. lib/Makefile does not apply cleanly: rdunlap@midway:linux-next-20180910> quilt push Applying patch generic-radix-trees.patch patching file include/linux/generic-radix-tree.h patching file lib/Makefile Hunk #1 FAILED at 38. 1 out of 1 hunk FAILED -- rejects in file lib/Makefile patching file lib/generic-radix-tree.c Patch generic-radix-trees.patch does not apply (enforce with -f) rdunlap@midway:linux-next-20180910> quilt push -f Applying patch generic-radix-trees.patch patching file include/linux/generic-radix-tree.h patching file lib/Makefile Hunk #1 FAILED at 38. 1 out of 1 hunk FAILED -- saving rejects to file lib/Makefile.rej patching file lib/generic-radix-tree.c Applied patch generic-radix-trees.patch (forced; needs refresh) rdunlap@midway:linux-next-20180910> quilt files | more include/linux/generic-radix-tree.h lib/generic-radix-tree.c <fix lib/Makefile hunk failure> rdunlap@midway:linux-next-20180910> quilt ref Refreshed patch generic-radix-trees.patch rdunlap@midway:linux-next-20180910> quilt files | more include/linux/generic-radix-tree.h lib/generic-radix-tree.c lib/Makefile is not part of the patch, although diff does see that generic-radix-tree.o has been added to it: rdunlap@midway:lib> diff -u Makefile.orig Makefile --- Makefile.orig 2018-08-12 13:41:04.000000000 -0700 +++ Makefile 2018-09-10 13:34:23.844918294 -0700 @@ -37,8 +37,9 @@ bust_spinlocks.o kasprintf.o bitmap.o scatterlist.o \ gcd.o lcm.o list_sort.o uuid.o flex_array.o iov_iter.o clz_ctz.o \ bsearch.o find_bit.o llist.o memweight.o kfifo.o \ - percpu-refcount.o percpu_ida.o rhashtable.o reciprocal_div.o \ - once.o refcount.o usercopy.o errseq.o bucket_locks.o + percpu-refcount.o rhashtable.o reciprocal_div.o \ + once.o refcount.o usercopy.o errseq.o bucket_locks.o \ + generic-radix-tree.o What happened? Help? thanks, -- ~Randy _______________________________________________ Quilt-dev mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/quilt-dev
