This is a note to let you know that I've just added the patch titled
Documentation: Update stable address in Chinese and Japanese translations
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
documentation-update-stable-address-in-chinese-and-japanese-translations.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 98b0f811aade1b7c6e7806c86aa0befd5919d65f Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Date: Mon, 14 Apr 2014 18:52:14 +0200
Subject: Documentation: Update stable address in Chinese and Japanese translations
From: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
commit 98b0f811aade1b7c6e7806c86aa0befd5919d65f upstream.
The English and Korean translations were updated, the Chinese and Japanese
weren't.
Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
Documentation/ja_JP/HOWTO | 2 +-
Documentation/ja_JP/stable_kernel_rules.txt | 6 +++---
Documentation/zh_CN/HOWTO | 2 +-
Documentation/zh_CN/stable_kernel_rules.txt | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
--- a/Documentation/ja_JP/HOWTO
+++ b/Documentation/ja_JP/HOWTO
@@ -315,7 +315,7 @@ Andrew Morton ã?? Linux-kernel ã?¡ã?¼ã?ª
ã??ã??ã??3.x.y ã?«ã?¼ã??ã?«ã??å?å?¨ã??ã?ªã??å ´å??ã?«ã?¯ã??ç?ªå?·ã??ä¸?ç?ªå¤§ã??ã?? 3.x ã??
æ??æ?°ã?®å®?å®?ç??ã?«ã?¼ã??ã?«ã?§ã??ã??
-3.x.y ã?¯ "stable" ã??ã?¼ã? <stable@xxxxxxxxxx> ã?§ã?¡ã?³ã??ã??ã??ã?¦ã??ã??ã??å¿?
+3.x.y ã?¯ "stable" ã??ã?¼ã? <stable@xxxxxxxxxxxxxxx> ã?§ã?¡ã?³ã??ã??ã??ã?¦ã??ã??ã??å¿?
è¦?ã?«å¿?ã??ã?¦ã?ªã?ªã?¼ã?¹ã??ã??ã?¾ã??ã??é??常ã?®ã?ªã?ªã?¼ã?¹æ??é??ã?¯ 2é?±é??æ¯?ã?§ã??ã??ã??å·®ã??è¿«ã?£
ã??å??é¡?ã??ã?ªã??ã??ã?°ã??ã??å°?ã??é?·ã??ã?ªã??ã??ã?¨ã??ã??ã??ã?¾ã??ã??ã?»ã?ã?¥ã?ªã??ã?£é?¢é?£ã?®å??é¡?
ã?®å ´å??ã?¯ã??ã??ã?«å¯¾ã??ã?¦ã? ã??ã??ã??ã?®å ´å??ã??ã??ã??ã?«ã?ªã?ªã?¼ã?¹ã??ã??ã??ã?¾ã??ã??
--- a/Documentation/ja_JP/stable_kernel_rules.txt
+++ b/Documentation/ja_JP/stable_kernel_rules.txt
@@ -50,16 +50,16 @@ linux-2.6.29/Documentation/stable_kernel
-stable ã??ã?ªã?¼ã?«ã??ã??ã??ã??é??ä»?ã??ã??æ??ç¶?ã??-
- - ä¸?è¨?ã?®è¦?å??ã?«å¾?ã?£ã?¦ã??ã??ã??ã??確èª?ã??ã??å¾?ã?«ã??stable@xxxxxxxxxx ã?«ã??ã??ã??
+ - ä¸?è¨?ã?®è¦?å??ã?«å¾?ã?£ã?¦ã??ã??ã??ã??確èª?ã??ã??å¾?ã?«ã??stable@xxxxxxxxxxxxxxx ã?«ã??ã??ã??
ã??é??ã??ã??
- é??ä¿¡è??ã?¯ã??ã??ã??ã??ã?ã?¥ã?¼ã?«å??ã??ä»?ã??ã??ã??ã??é??ã?«ã?¯ ACK ã??ã??å?´ä¸?ã??ã??ã??å ´å??
ã?«ã?¯ NAK ã??å??ã??å??ã??ã??ã??ã?®å??å¿?ã?¯é??ç?ºè??ã??ã?¡ã?®ã?¹ã?±ã?¸ã?¥ã?¼ã?«ã?«ã??ã?£ã?¦ã??æ?°
æ?¥ã??ã??ã??å ´å??ã??ã??ã??ã??
- ã??ã??å??ã??å??ã??ã??ã??ã??ã??ã??ã??ã??ã?¯ä»?ã?®é??ç?ºè??ã??ã?¡ã?¨é?¢é?£ã??ã??ã?µã??ã?·ã?¹ã??ã? ã?®
ã?¡ã?³ã??ã??ã?¼ã?«ã??ã??ã?¬ã??ã?¥ã?¼ã?®ã??ã??ã?« -stable ã?ã?¥ã?¼ã?«è¿½å? ã??ã??ã??ã??
- - ã??ã??ã??ã?« stable@xxxxxxxxxx ã?®ã?¢ã??ã?¬ã?¹ã??ä»?å? ã??ã??ã?¦ã??ã??ã?¨ã??ã?«ã?¯ã??ã??ã??
+ - ã??ã??ã??ã?« stable@xxxxxxxxxxxxxxx ã?®ã?¢ã??ã?¬ã?¹ã??ä»?å? ã??ã??ã?¦ã??ã??ã?¨ã??ã?«ã?¯ã??ã??ã??
ã?? Linus ã?®ã??ã?ªã?¼ã?«å?¥ã??æ??ã?«è?ªå??ç??ã?« stable ã??ã?¼ã? ã?« email ã??ã??ã??ã??
- - ã?»ã?ã?¥ã?ªã??ã?£ã??ã??ã??ã?¯ã??ã?®ã?¨ã?¤ã?ªã?¢ã?¹ (stable@xxxxxxxxxx) ã?«é??ã??ã??ã??ã?¹
+ - ã?»ã?ã?¥ã?ªã??ã?£ã??ã??ã??ã?¯ã??ã?®ã?¨ã?¤ã?ªã?¢ã?¹ (stable@xxxxxxxxxxxxxxx) ã?«é??ã??ã??ã??ã?¹
ã??ã?§ã?¯ã?ªã??ã??代ã??ã??ã?« security@xxxxxxxxxx ã?®ã?¢ã??ã?¬ã?¹ã?«é??ã??ã??ã??ã??
ã?¬ã??ã?¥ã?¼ã?µã?¤ã?¯ã?«-
--- a/Documentation/zh_CN/HOWTO
+++ b/Documentation/zh_CN/HOWTO
@@ -237,7 +237,7 @@ kernel.orgç½?ç«?ç??pub/linux/kernel/v2.6
å¦?æ??没æ??2.6.x.yç??æ?¬å??æ ¸å?å?¨ï¼?é?£ä¹?æ??æ?°ç??2.6.xç??æ?¬å??æ ¸å°±ç?¸å½?äº?æ?¯å½?å??ç??稳å®?
ç??å??æ ¸ã??
-2.6.x.yç??æ?¬ç?±â??稳å®?ç??â??å°?ç»?ï¼?é?®ä»¶å?°å??<stable@xxxxxxxxxx>ï¼?ç»´æ?¤ï¼?ä¸?è?¬é??å?¨å??
+2.6.x.yç??æ?¬ç?±â??稳å®?ç??â??å°?ç»?ï¼?é?®ä»¶å?°å??<stable@xxxxxxxxxxxxxxx>ï¼?ç»´æ?¤ï¼?ä¸?è?¬é??å?¨å??
å¸?æ?°ç??æ?¬ã??
å??æ ¸æº?ç ?ä¸ç??Documentation/stable_kernel_rules.txtæ??件å?·ä½?æ??è¿°äº?å?¯è¢«ç¨³å®?
--- a/Documentation/zh_CN/stable_kernel_rules.txt
+++ b/Documentation/zh_CN/stable_kernel_rules.txt
@@ -42,7 +42,7 @@ Documentation/stable_kernel_rules.txt ç?
å??稳å®?ç??代ç ?æ ?æ??交补ä¸?ç??è¿?ç¨?ï¼?
- - å?¨ç¡®è®¤äº?è¡¥ä¸?符å??以ä¸?ç??è§?å??å??ï¼?å°?è¡¥ä¸?å??é??å?°stable@xxxxxxxxxxã??
+ - å?¨ç¡®è®¤äº?è¡¥ä¸?符å??以ä¸?ç??è§?å??å??ï¼?å°?è¡¥ä¸?å??é??å?°stable@xxxxxxxxxxxxxxxã??
- å¦?æ??è¡¥ä¸?被æ?¥å??å?°é??å??é??ï¼?å??é??è??ä¼?æ?¶å?°ä¸?个ACKå??å¤?ï¼?å¦?æ??没æ??被æ?¥å??ï¼?æ?¶
å?°ç??æ?¯NAKå??å¤?ã??å??å¤?é??è¦?å? 天ç??æ?¶é?´ï¼?è¿?å??å?³äº?å¼?å??è??ç??æ?¶é?´å®?æ??ã??
- 被æ?¥å??ç??è¡¥ä¸?ä¼?被å? å?°ç¨³å®?ç??æ?¬é??å??é??ï¼?ç?å¾?å?¶ä»?å¼?å??è??ç??审æ?¥ã??
Patches currently in stable-queue which might be from geert+renesas@xxxxxxxxx are
queue-3.14/documentation-update-stable-address-in-chinese-and-japanese-translations.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html