The patch titled i386: Correct documentation for bzImage protocol v2.05 has been added to the -mm tree. Its filename is i386-correct-documentation-for-bzimage-protocol-v205.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: i386: Correct documentation for bzImage protocol v2.05 From: Vivek Goyal <vgoyal@xxxxxxxxxx> Correct the documentation for bzImage protocol extension due to relocatable bzImage. Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- Documentation/i386/boot.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN Documentation/i386/boot.txt~i386-correct-documentation-for-bzimage-protocol-v205 Documentation/i386/boot.txt --- a/Documentation/i386/boot.txt~i386-correct-documentation-for-bzimage-protocol-v205 +++ a/Documentation/i386/boot.txt @@ -2,7 +2,7 @@ ---------------------------- H. Peter Anvin <hpa@xxxxxxxxx> - Last update 2005-09-02 + Last update 2006-11-17 On the i386 platform, the Linux kernel uses a rather complicated boot convention. This has evolved partially due to historical aspects, as @@ -131,8 +131,8 @@ Offset Proto Name Meaning 0226/2 N/A pad1 Unused 0228/4 2.02+ cmd_line_ptr 32-bit pointer to the kernel command line 022C/4 2.03+ initrd_addr_max Highest legal initrd address -0230/4 2.04+ kernel_alignment Physical addr alignment required for kernel -0234/1 2.04+ relocatable_kernel Whether kernel is relocatable or not +0230/4 2.05+ kernel_alignment Physical addr alignment required for kernel +0234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not (1) For backwards compatibility, if the setup_sects field contains 0, the real value is 4. _ Patches currently in -mm which might be from vgoyal@xxxxxxxxxx are i386-correct-documentation-for-bzimage-protocol-v205.patch clockevents-core-check-for-clock-event-device-handler-being-non-null-before-calling-it.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html