diff -r 83ce0882d42d -r 0b27f6ceb693 config/kernel/linux.in --- a/config/kernel/linux.in Wed Nov 24 23:10:55 2010 +0100 +++ b/config/kernel/linux.in Fri Dec 17 23:48:15 2010 +0100 @@ -1,5 +1,3 @@ -# Linux kernel options - # Linux kernel options config KERNEL_linux @@ -26,6 +24,10 @@ # Don't remove next line # CT_INSERT_VERSION_BELOW +config KERNEL_V_2_6_36_2 + bool + prompt "2.6.36.2" + config KERNEL_V_2_6_36_1 bool prompt "2.6.36.1" @@ -34,9 +36,23 @@ bool prompt "2.6.36" -config KERNEL_V_2_6_35_9 +config KERNEL_V_2_6_35_10 bool - prompt "2.6.35.9" + prompt "2.6.35.10 (longterm)" + The Linux 2.6.35 tree is a "longterm" maintenance branch. + + It is intended to fill the niche for users who are not using distribution + kernels but want to use a regression-free kernel for a longer time. + + Critical bug fixes to later 2.6 releases are often ported to this branch + which makes 2.6.35 a very useful base for many embedded developers seeking + stable APIs or those who do not need the latest bleeding edge features. + + ... and no, this kernel has not undergone any specific QA testing. + + See the original announcement by Andi Kleen in the following mailing + list entry: + http://marc.info/?l=linux-kernel&m=129136895415202&w=4 config KERNEL_V_2_6_34_7 bool @@ -46,11 +62,12 @@ bool prompt "2.6.33.7" -config KERNEL_V_2_6_32_26 +config KERNEL_V_2_6_32_27 bool - prompt "2.6.32.26 (long-term stable)" + prompt "2.6.32.27 (longterm)" help - The Linux 2.6.32 tree is the current "long-term stable" maintenance branch. + The Linux 2.6.32 tree is a "longterm" maintenance branch. + It is intended to fill the niche for users who are not using distribution kernels but want to use a regression-free kernel for a longer time. @@ -62,17 +79,18 @@ See the original announcement by Greg Kroah-Hartman in the following mailing list entry: - http://marc.info/?l=linux-kernel&m=126384198403392&w=2 + http://marc.info/?l=linux-kernel&m=126384198403392&w=4 config KERNEL_V_2_6_31_14 bool prompt "2.6.31.14" -config KERNEL_V_2_6_27_56 +config KERNEL_V_2_6_27_57 bool - prompt "2.6.27.56 (old long-term stable)" + prompt "2.6.27.57 (longterm)" help - The Linux 2.6.27 tree is the previous "long-term stable" maintenance branch. + The Linux 2.6.27 tree is a "longterm" maintenance branch. + It is intended to fill the niche for users who are not using distribution kernels but want to use a regression-free kernel for a longer time. @@ -84,7 +102,10 @@ See the original announcement by Adrian Bunk in the following mailing list entry: - http://marc.info/?l=linux-kernel&m=122375909403298&w=2 + http://marc.info/?l=linux-kernel&m=122375909403298&w=4 + + It is now maintained by Greg Kroah-Hartman, see this mailing list entry: + http://marc.info/?l=linux-kernel&m=129133701916793&w=4 config KERNEL_LINUX_CUSTOM bool @@ -105,14 +126,15 @@ string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW + default "2.6.36.2" if KERNEL_V_2_6_36_2 default "2.6.36.1" if KERNEL_V_2_6_36_1 default "2.6.36" if KERNEL_V_2_6_36 - default "2.6.35.9" if KERNEL_V_2_6_35_9 + default "2.6.35.10" if KERNEL_V_2_6_35_10 default "2.6.34.7" if KERNEL_V_2_6_34_7 default "2.6.33.7" if KERNEL_V_2_6_33_7 - default "2.6.32.26" if KERNEL_V_2_6_32_26 + default "2.6.32.27" if KERNEL_V_2_6_32_26 default "2.6.31.14" if KERNEL_V_2_6_31_14 - default "2.6.27.56" if KERNEL_V_2_6_27_56 + default "2.6.27.57" if KERNEL_V_2_6_27_57 choice bool