Re: [PATCH 00/10] various cleanup
On Mon, Feb 26, 2018 at 01:15:49PM +, 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
Re: [PATCH 00/10] various cleanup
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? Best Regards, Leif ___ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH 00/10] various cleanup
On Thu, Feb 15, 2018 at 11:34:18AM +0100, Daniel Kiper wrote: > Sorry for delay. > > On Thu, Feb 01, 2018 at 06:18:48PM +, Leif Lindholm wrote: > > So, sorry I dropped the ball on this last year. > > > > This series contains what I would hope to be non-contentious > > cleanup in preparation for the functional changes (/fixes) for > > the arm64 linux loader and its reuse in the arm-efi port. > > > >1/10 Simply moves the EFI_PAGE definition to . > > 2-7/10 Cleans up and aligns the macro and struct naming for > > . > >8/10 Makes it possible to include in a non-native > > command or utility. > > 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. FYI, this is last time when I sent commit confirmation. If I send one in the future then this will be rather exception than rule. So, if you receive my reviewed-by and patch is not committed in a week or two then it means that it fallen into abyss and you have to ping me. Have a nice weekend, Daniel ___ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH 00/10] various cleanup
Sorry for delay. On Thu, Feb 01, 2018 at 06:18:48PM +, Leif Lindholm wrote: > So, sorry I dropped the ball on this last year. > > This series contains what I would hope to be non-contentious > cleanup in preparation for the functional changes (/fixes) for > the arm64 linux loader and its reuse in the arm-efi port. > >1/10 Simply moves the EFI_PAGE definition to . > 2-7/10 Cleans up and aligns the macro and struct naming for > . >8/10 Makes it possible to include in a non-native > command or utility. > 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. Daniel ___ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
[PATCH 00/10] various cleanup
So, sorry I dropped the ball on this last year. This series contains what I would hope to be non-contentious cleanup in preparation for the functional changes (/fixes) for the arm64 linux loader and its reuse in the arm-efi port. 1/10 Simply moves the EFI_PAGE definition to . 2-7/10 Cleans up and aligns the macro and struct naming for . 8/10 Makes it possible to include in a non-native command or utility. 9-10/10 Switches to use the arm/arm64 kernel header structs in the "file" command". Leif Lindholm (10): arm64/efi: move EFI_PAGE definitions to efi/memory.h Make arch-specific linux.h include guards architecture unique make GRUB_LINUX_MAGIC_SIGNATURE architecture-specific i386: make struct linux_kernel_header architecture specific arm64: align linux kernel header struct naming with i386 arm64: align linux kernel magic macro naming with i386 arm: switch linux loader to linux_arm_kernel_header struct arm: make linux.h safe to include for non-native builds commands/file: use definitions from arm/linux.h commands/file: use definitions from arm64/linux.h grub-core/commands/file.c | 31 +++ grub-core/loader/arm/linux.c | 11 +-- grub-core/loader/arm64/linux.c| 7 --- grub-core/loader/arm64/xen_boot.c | 5 +++-- grub-core/loader/efi/fdt.c| 1 + grub-core/loader/i386/linux.c | 4 ++-- grub-core/loader/i386/pc/linux.c | 12 ++-- grub-core/loader/i386/xen_file.c | 4 ++-- include/grub/arm/linux.h | 25 + include/grub/arm64/linux.h| 13 ++--- include/grub/efi/fdtload.h| 3 --- include/grub/efi/memory.h | 7 +++ include/grub/i386/linux.h | 10 +- 13 files changed, 73 insertions(+), 60 deletions(-) -- 2.11.0 ___ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
