On Mon, Feb 26, 2018 at 01:15:49PM +0000, Leif Lindholm wrote: > On Fri, Feb 23, 2018 at 11:11:08PM +0100, Daniel Kiper wrote: > > > > 9-10/10 Switches to use the arm/arm64 kernel header structs in the > > > > "file" command". > > > > > > I am OK, excluding patch 9, with this patch series. If there are no > > > objections I will apply patches 1-8 and 10 next week. > > > > Due to conflicts in patch 10 I have just applied patches 1-8. > > Please repost patches 9 and 10. > > I could re-post them, but they would look identical. > I'm a bit confused as to what the conflict is, since I can rebase the > two commits onto current master without issues, and cherry-pick them > cleanly. > > Could you try cherry-picking them from > https://git.linaro.org/people/leif.lindholm/grub.git/log/?h=linux-cleanup > ? > > If you still have issues, can you show me the conflict?
It looks that I was not clear enough. Sorry about that. I had some comments for patch 9. So, I decided to skip it and apply patch 10 after 8. Sadly it looks that patch 10 depends on some changes in patch 9, so, I was not able to apply it. Hence, please fix patch 9, as I ask for, and repost both patch 9 and 10. I hope that helps. Daniel _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel