From d4f9ac7ac4865e2ee49dddee7e52bae0cdcdd88e Mon Sep 17 00:00:00 2001 From: wi-cuckoo Date: Mon, 15 Jun 2015 22:21:18 +0800 Subject: [PATCH 1/2] translating wi-cuckoo --- sources/talk/20150304 ​No reboot patching comes to Linux 4.0.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/talk/20150304 ​No reboot patching comes to Linux 4.0.md b/sources/talk/20150304 ​No reboot patching comes to Linux 4.0.md index 6333fea9a7..76a4545bf8 100644 --- a/sources/talk/20150304 ​No reboot patching comes to Linux 4.0.md +++ b/sources/talk/20150304 ​No reboot patching comes to Linux 4.0.md @@ -1,3 +1,4 @@ +translating wi-cuckoo ​No reboot patching comes to Linux 4.0 ================================================================================ > **Summary**:With the new Linux 4.0 kernel, you'll need to reboot Linux less often than ever. @@ -55,4 +56,4 @@ via: http://www.zdnet.com/article/no-reboot-patching-comes-to-linux-4-0/#ftag=RS [11]:http://www.zdnet.com/article/suse-gets-live-patching/ [12]:http://elinux.org/Ftrace [13]:http://linuxplumbersconf.org/2014/wp-content/uploads/2014/10/LPC2014_LivePatching.txt -[14]:https://kernel.googlesource.com/pub/scm/linux/kernel/git/jikos/livepatching/+/9ec0de0ee0c9f0ffe4f72da9158194121cc22807 \ No newline at end of file +[14]:https://kernel.googlesource.com/pub/scm/linux/kernel/git/jikos/livepatching/+/9ec0de0ee0c9f0ffe4f72da9158194121cc22807 From 96f60b9298235892f846894d3bcfc5d0109db0ab Mon Sep 17 00:00:00 2001 From: wi-cuckoo Date: Mon, 15 Jun 2015 22:26:06 +0800 Subject: [PATCH 2/2] soluted the conflict --- sources/talk/20150304 ​No reboot patching comes to Linux 4.0.md | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/talk/20150304 ​No reboot patching comes to Linux 4.0.md b/sources/talk/20150304 ​No reboot patching comes to Linux 4.0.md index 6c3396907c..76a4545bf8 100644 --- a/sources/talk/20150304 ​No reboot patching comes to Linux 4.0.md +++ b/sources/talk/20150304 ​No reboot patching comes to Linux 4.0.md @@ -1,3 +1,4 @@ +translating wi-cuckoo ​No reboot patching comes to Linux 4.0 ================================================================================ > **Summary**:With the new Linux 4.0 kernel, you'll need to reboot Linux less often than ever.