Merge pull request #1019 from keloyang/remote-by

dqminh · web-flow · commit da202fe23208 · 2016-09-07T22:01:19.000+01:00
remove redundant by in annotation(nsexec.c)
diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c
@@ -108,7 +108,7 @@ static int clone_parent(jmp_buf *env, int flags)
 	 * On old kernels, CLONE_PARENT didn't work with CLONE_NEWPID, so we have
 	 * to unshare(2) before clone(2) in order to do this. This was fixed in
 	 * upstream commit 1f7f4dde5c945f41a7abc2285be43d918029ecc5, and was
-	 * introduced by by 40a0d32d1eaffe6aac7324ca92604b6b3977eb0e.
+	 * introduced by 40a0d32d1eaffe6aac7324ca92604b6b3977eb0e.
 	 *
 	 * As far as we're aware, the last mainline kernel which had this bug was
 	 * Linux 3.12. However, we cannot comment on which kernels the broken patch

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ static int clone_parent(jmp_buf *env, int flags)`
`108`	`108`	`* On old kernels, CLONE_PARENT didn't work with CLONE_NEWPID, so we have`
`109`	`109`	`* to unshare(2) before clone(2) in order to do this. This was fixed in`
`110`	`110`	`* upstream commit 1f7f4dde5c945f41a7abc2285be43d918029ecc5, and was`
`111`		`- * introduced by by 40a0d32d1eaffe6aac7324ca92604b6b3977eb0e.`
	`111`	`+ * introduced by 40a0d32d1eaffe6aac7324ca92604b6b3977eb0e.`
`112`	`112`	`*`
`113`	`113`	`* As far as we're aware, the last mainline kernel which had this bug was`
`114`	`114`	`* Linux 3.12. However, we cannot comment on which kernels the broken patch`