public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Jan Kara <jack@suse.cz>, Al Viro <viro@ZenIV.linux.org.uk>
Cc: LKML <linux-kernel@vger.kernel.org>,
	linux-fsdevel@vger.kernel.org, dushistov@mail.ru,
	joel.becker@oracle.com, shaggy@linux.vnet.ibm.com,
	linux-ext4@vger.kernel.org
Subject: Re: [PULL REQUEST] Quota cleanups & fixes and ext3 fixes for 2.6.34-rc1
Date: Fri, 5 Mar 2010 13:24:35 -0800 (PST)	[thread overview]
Message-ID: <alpine.LFD.2.00.1003051314330.3906@localhost.localdomain> (raw)
In-Reply-To: <20100305003304.GE4887@quack.suse.cz>



On Fri, 5 Mar 2010, Jan Kara wrote:
> 
>   could you please pull from
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git for_linus
> 
>   You'll get lots of quota cleanups from Christoph which touch filesystems
> all over the place but it's just function renaming and moving quota calls
> from VFS into filesystems themselves.

Gaah. This interacted with the VFS stuff (the do_filp_open() cleanip in 
particular) I merged from Al earlier today. 

It really looked very trivial, so I fixed it up. Al had split up 
do_filp_open() into several helper functions, and one of your changes was 
to the old pre-split one. I felt confident enough about it that I just did 
the obvious merge resolution, but you guys should check it out to be sure.

			Linus

  reply	other threads:[~2010-03-05 21:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-05  0:33 [PULL REQUEST] Quota cleanups & fixes and ext3 fixes for 2.6.34-rc1 Jan Kara
2010-03-05 21:24 ` Linus Torvalds [this message]
2010-03-05 23:01   ` Al Viro
2010-03-06  9:55     ` Christoph Hellwig

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=alpine.LFD.2.00.1003051314330.3906@localhost.localdomain \
    --to=torvalds@linux-foundation.org \
    --cc=dushistov@mail.ru \
    --cc=jack@suse.cz \
    --cc=joel.becker@oracle.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=shaggy@linux.vnet.ibm.com \
    --cc=viro@ZenIV.linux.org.uk \
    /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