release docs/kernel-docs-2.6/stable_kernel_rules.txt [JF:20061]

diff --git a/docs/kernel-docs-2.6/stable_kernel_rules.txt b/docs/kernel-docs-2.6/stable_kernel_rules.txt
index 28d38e0..c63ddf8 100644 (file)
--- a/docs/kernel-docs-2.6/stable_kernel_rules.txt
+++ b/docs/kernel-docs-2.6/stable_kernel_rules.txt
@@ -1,10 +1,10 @@
 ==================================
 ¤³¤ì¤Ï¡¢
-linux-2.6.29/Documentation/stable_kernel_rules.txt
+linux-2.6.38/Documentation/stable_kernel_rules.txt
 ¤ÎÏÂÌõ¤Ç¤¹¡£
 
 ËÝÌõÃÄÂΡ§ JF ¥×¥í¥¸¥§¥¯¥È < http://www.linux.or.jp/JF/ >
-ËÝÌõÆü¡§ 2009/1/14
+ËÝÌõÆü¡§ 2011/5/9
 ËÝÌõ¼Ô¡§ Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com>
 ¹»Àµ¼Ô¡§ Éð°æ¿­¸÷¤µ¤ó¡¢<takei at webmasters dot gr dot jp>
          ¤«¤Í¤³¤µ¤ó (Seiji Kaneko) <skaneko at a2 dot mbn dot or dot jp>
@@ -32,21 +32,39 @@ linux-2.6.29/Documentation/stable_kernel_rules.txt
  - ¤¤¤«¤Ê¤ëº³ºÙ¤Ê½¤Àµ¤â´Þ¤á¤ë¤³¤È¤Ï¤Ç¤­¤Ê¤¤¡£(¥¹¥Ú¥ë¤Î½¤Àµ¡¢¶õÇò¤Î¥¯¥ê¡¼
    ¥ó¥¢¥Ã¥×¤Ê¤É)
  - Documentation/SubmittingPatches ¤Îµ¬Â§¤Ë½¾¤Ã¤¿¤â¤Î¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£
- - ¥Ñ¥Ã¥Á¼«ÂΤ«Æ±Åù¤Î½¤Àµ¤¬ Linus ¤Î¥Ä¥ê¡¼¤Ë´û¤Ë¸ºß¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£
-¡¡ Linus ¤Î¥Ä¥ê¡¼¤Ç¤Î¥³¥ß¥Ã¥ÈID ¤ò -stable ¤Ø¤Î¥Ñ¥Ã¥ÁÅê¹Æ¤ÎºÝ¤Ë°úÍѤ¹
-   ¤ë¤³¤È¡£
+ - ¥Ñ¥Ã¥Á¼«ÂΤ⤷¤¯¤ÏƱÍͤʽ¤Àµ¤Ï¤¢¤é¤«¤¸¤á Linus¤Î¥Ä¥ê¡¼( upstream )
+   ¤Ë¸ºß¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤
 
 -stable ¥Ä¥ê¡¼¤Ë¥Ñ¥Ã¥Á¤òÁ÷ÉÕ¤¹¤ë¼ê³¤­-
 
  - ¾åµ­¤Îµ¬Â§¤Ë½¾¤Ã¤Æ¤¤¤ë¤«¤ò³Îǧ¤·¤¿¸å¤Ë¡¢stable@kernel.org ¤Ë¥Ñ¥Ã¥Á
-   ¤òÁ÷¤ë¡£
+   ¤òÁ÷¤ë¡£¤¢¤Ê¤¿¤Ï¼«¿È¤ÎÅê¹Æ¤Î changelog ¤Ë upstream ¤Î¥³¥ß¥Ã¥ÈID ¤ò
+   Éղ䷤ʤ±¤ì¤Ð¤Ê¤é¤Ê¤¤
+ - ¼«Æ°Åª¤Ë¤½¤Î¥Ñ¥Ã¥Á¤¬ stable¥Ä¥ê¡¼¤Ë´Þ¤á¤é¤ì¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢
+     Cc: stable@kernel.org
+   ¤Î¥¿¥°¤ò¥µ¥¤¥ó¥ª¥ÕÎΰè¤ËÄɲ乤뤳¤È¡£°ìÅ٥ѥåÁ¤¬¥Þ¡¼¥¸¤µ¤ì¤ì¤Ð¡¢
+   ¤½¤ì¤Ïºî¼Ô¤ä¥µ¥Ö¥·¥¹¥Æ¥à¥á¥ó¥Æ¥Ê¡¼¤¬²¿¤â¤¹¤ëɬÍפʤ·¤Ë¥¹¥Æ¡¼¥Ö¥ë¥Ä
+   ¥ê¡¼¤ËŬÍѤµ¤ì¤ë
+ - ¤â¤·¥Ñ¥Ã¥Á¤¬Â¾¤Î¥Ñ¥Ã¥Á¤òɬÍ×¾ò·ï¤È¤·¤Æ¸ÄÊ̤ËÍ׵᤹¤ë¾ì¹ç¤Ë¤Ï¡¢¥µ¥¤
+   ¥ó¥ª¥Õ¥¨¥ê¥¢¤Ë¼¡¤Î¤è¤¦¤Ê·Á¼°¤Ç»ØÄꤹ¤ë¤³¤È¤ÇÁªÂò¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë
+
+    Cc: <stable@kernel.org> # .32.x: a1f84a3: sched: Check for idle
+    Cc: <stable@kernel.org> # .32.x: 1b9508f: sched: Rate-limit newidle
+    Cc: <stable@kernel.org> # .32.x: fd21073: sched: Fix affinity logic
+    Cc: <stable@kernel.org> # .32.x
+    Signed-off-by: Ingo Molnar <mingo@elte.hu>
+
+   ¥¿¥°¤Î½çÈ֤ΰÕÌ£¤Ï°Ê²¼¡§
+    git cherry-pick a1f84a3
+    git cherry-pick 1b9508f
+    git cherry-pick fd21073
+    git cherry-pick <¤³¤Î¥³¥ß¥Ã¥È>
+
  - Á÷¿®¼Ô¤Ï¥Ñ¥Ã¥Á¤¬¥­¥å¡¼¤Ë¼õ¤±ÉÕ¤±¤é¤ì¤¿ºÝ¤Ë¤Ï ACK ¤ò¡¢µÑ²¼¤µ¤ì¤¿¾ì¹ç
    ¤Ë¤Ï NAK ¤ò¼õ¤±¼è¤ë¡£¤³¤ÎÈ¿±þ¤Ï³«È¯¼Ô¤¿¤Á¤Î¥¹¥±¥¸¥å¡¼¥ë¤Ë¤è¤Ã¤Æ¡¢¿ô
    Æü¤«¤«¤ë¾ì¹ç¤¬¤¢¤ë¡£
  - ¤â¤·¼õ¤±¼è¤é¤ì¤¿¤é¡¢¥Ñ¥Ã¥Á¤Ï¾¤Î³«È¯¼Ô¤¿¤Á¤È´ØÏ¢¤¹¤ë¥µ¥Ö¥·¥¹¥Æ¥à¤Î
    ¥á¥ó¥Æ¥Ê¡¼¤Ë¤è¤ë¥ì¥Ó¥å¡¼¤Î¤¿¤á¤Ë -stable ¥­¥å¡¼¤ËÄɲ䵤ì¤ë¡£
- - ¥Ñ¥Ã¥Á¤Ë stable@kernel.org ¤Î¥¢¥É¥ì¥¹¤¬Éղ䵤ì¤Æ¤¤¤ë¤È¤­¤Ë¤Ï¡¢¤½¤ì
-   ¤¬ Linus ¤Î¥Ä¥ê¡¼¤ËÆþ¤ë»þ¤Ë¼«Æ°Åª¤Ë stable ¥Á¡¼¥à¤Ë email ¤µ¤ì¤ë¡£
  - ¥»¥­¥å¥ê¥Æ¥£¥Ñ¥Ã¥Á¤Ï¤³¤Î¥¨¥¤¥ê¥¢¥¹ (stable@kernel.org) ¤ËÁ÷¤é¤ì¤ë¤Ù
    ¤­¤Ç¤Ï¤Ê¤¯¡¢Âå¤ï¤ê¤Ë security@kernel.org ¤Î¥¢¥É¥ì¥¹¤ËÁ÷¤é¤ì¤ë¡£
 

diff --git a/docs/kernel-docs-2.6/stable_kernel_rules.txt.info b/docs/kernel-docs-2.6/stable_kernel_rules.txt.info
index 0a38574..482d591 100644 (file)
--- a/docs/kernel-docs-2.6/stable_kernel_rules.txt.info
+++ b/docs/kernel-docs-2.6/stable_kernel_rules.txt.info
@@ -8,11 +8,11 @@ ATRB: MISC
 NAME: stable_kernel_rules.txt
 DSRC: TXT
 BDAT: 2007/09/20
-JDAT: 2009/01/14
-BVER: 2.6.29
+JDAT: 2011/05/11
+BVER: 2.6.38
 ITEM: etc
 AUTH: unknown
 TRNS: Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com>
 CONT: Stable ¥«¡¼¥Í¥ë¤Î¸ø³«¥×¥í¥»¥¹
-COPY: NOTHING
+COPY: GPL2
 KEY1: misc

diff --git a/www/news.m4 b/www/news.m4
index a7abcc7..0701e79 100644 (file)
--- a/www/news.m4
+++ b/www/news.m4
@@ -45,6 +45,9 @@ m4_define(`_NEW_DOC',`
    </DT>')
 
  <DL>
+_UPD_DOC(kernel-docs-2.6/stable_kernel_rules.txt.html,2011/05/20,
+       `kernel-2.6 ÉÕ° stable_kernel_rules.txt ¤ÎÆüËܸìÌõ')
+
 _UPD_DOC(kernel-docs-2.6/HOWTO.html,2011/03/28,
        `kernel-2.6 ÉÕ° HOWTO ¤ÎÆüËܸìÌõ')