Messages in this thread | | | Date | Fri, 7 Nov 2008 15:55:20 -0800 | From | Greg KH <> | Subject | Re: Linux 2.6.27.5 |
| |
On Fri, Nov 07, 2008 at 03:44:49PM -0800, Linus Torvalds wrote: > > > On Fri, 7 Nov 2008, Greg KH wrote: > > > > diff --git a/include/linux/sched.h b/include/linux/sched.h > > index 3d9120c..6bfb849 100644 > > --- a/include/linux/sched.h > > +++ b/include/linux/sched.h > > @@ -1286,7 +1286,9 @@ 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; > > You did somethign wrong here when merging that scm_destroy() fix. See the > badly indented comment start.
Ugh, you are right, it should be indented. Cut and paste caused that :(
I'll fix it up in the next version, there shouldn't be any problem as it's just a formatting issue. I had to do it by hand compared to the upstream version as the field structures were different between the kernel versions. I moved it higher up in the structure so there wouldn't be merge issues on .25 and .26 as well.
I'll go fix up the patch in those 2 review series too, as it's also formatted wrong there.
thanks,
greg k-h
| |