From 20e726e048f9590086b76e626a0f0d9f9c30fd7c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 7 Nov 2008 15:59:46 -0800 Subject: [PATCH] fix up minor formatting typo in the net-fix-recursive-descent-in-__scm_destroy.patch as found by Linus --- .../net-fix-recursive-descent-in-__scm_destroy.patch | 10 ++++------ .../net-fix-recursive-descent-in-__scm_destroy.patch | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/review-2.6.25/net-fix-recursive-descent-in-__scm_destroy.patch b/review-2.6.25/net-fix-recursive-descent-in-__scm_destroy.patch index 9bd7d01132d..286292df7f4 100644 --- a/review-2.6.25/net-fix-recursive-descent-in-__scm_destroy.patch +++ b/review-2.6.25/net-fix-recursive-descent-in-__scm_destroy.patch @@ -26,24 +26,22 @@ Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- - include/linux/sched.h | 4 +++- + include/linux/sched.h | 2 ++ include/net/scm.h | 5 +++-- net/core/scm.c | 24 +++++++++++++++++++++--- - 3 files changed, 27 insertions(+), 6 deletions(-) + 3 files changed, 26 insertions(+), 5 deletions(-) --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1256,7 +1256,9 @@ struct task_struct { +@@ -1256,6 +1256,8 @@ struct task_struct { atomic_t fs_excl; /* holding fs exclusive resources */ struct rcu_head rcu; -- /* + struct list_head *scm_work_list; + -+/* + /* * cache last used pipe for splice */ - struct pipe_inode_info *splice_pipe; --- a/include/net/scm.h +++ b/include/net/scm.h @@ -14,8 +14,9 @@ diff --git a/review-2.6.26/net-fix-recursive-descent-in-__scm_destroy.patch b/review-2.6.26/net-fix-recursive-descent-in-__scm_destroy.patch index 854779cacf5..99902fd9e01 100644 --- a/review-2.6.26/net-fix-recursive-descent-in-__scm_destroy.patch +++ b/review-2.6.26/net-fix-recursive-descent-in-__scm_destroy.patch @@ -26,24 +26,22 @@ Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- - include/linux/sched.h | 4 +++- + include/linux/sched.h | 2 ++ include/net/scm.h | 5 +++-- net/core/scm.c | 24 +++++++++++++++++++++--- - 3 files changed, 27 insertions(+), 6 deletions(-) + 3 files changed, 26 insertions(+), 5 deletions(-) --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1288,7 +1288,9 @@ struct task_struct { +@@ -1288,6 +1288,8 @@ struct task_struct { atomic_t fs_excl; /* holding fs exclusive resources */ struct rcu_head rcu; -- /* + struct list_head *scm_work_list; + -+/* + /* * cache last used pipe for splice */ - struct pipe_inode_info *splice_pipe; --- a/include/net/scm.h +++ b/include/net/scm.h @@ -14,8 +14,9 @@ -- 2.47.3