>>>On Tue, Nov 15, 2016 at 12:04 PM, Pratyush Anand <panand at redhat.com> wrote: >>>> Hi Atsushi, >>>> >>>> There would be a conflict because of following patch while applying >>>> these patches. Other than that I also see a an issue with --config >>>> option. So I will fix that as well and repost the series soon. >>> >>>Sorry, for the noise.That was a bad compilation of the code. >>> >>>Anyway, I resolved the conflict because of below patch in upstream >>>devel branch and r5pushed the patches in my git tree: >>>https://github.com/pratyushanand/makedumpfile.git : arm64_devel >>> >>>There is no changes other than conflict resolution w.r.t. this patch series. >>> >>>~Pratyush >>> >>>> >>>> 0068010b9b83 [PATCH v2 2/2] Clean up unused KERNEL_IMAGE_SIZE >> >> I'm sorry ! I misunderstood that I already pushed this series >> in the devel branch. Should I wait for v2 series where the >> conflict is resolved ? > >As you wish. I can send v2 (there is no difference other than conflict >resolution for rebasing on top of current devel, conflict is minor), >or you can pick them from >https://github.com/pratyushanand/makedumpfile.git : arm64_devel. Sure, I'll pick them (from 60352bd to 3b5faac, right?) up from your devel branch, thanks. Regards, Atsushi Kumagai
