public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
	Andrew Morton <akpm@linux-foundation.org>,
	stable@kernel.org
Subject: Re: Linux 2.6.27.5
Date: Fri, 7 Nov 2008 15:55:20 -0800	[thread overview]
Message-ID: <20081107235520.GA6155@suse.de> (raw)
In-Reply-To: <alpine.LFD.2.00.0811071543370.3468@nehalem.linux-foundation.org>

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

      reply	other threads:[~2008-11-07 23:55 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-07 23:34 Linux 2.6.27.5 Greg KH
2008-11-07 23:34 ` Greg KH
2008-11-07 23:44   ` Linus Torvalds
2008-11-07 23:55     ` Greg KH [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20081107235520.GA6155@suse.de \
    --to=gregkh@suse.de \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox