Re: [GIT PULL] ext4 update

2008-01-30 Thread Linus Torvalds
On Wed, 30 Jan 2008, Theodore Tso wrote: > > That's because you are doing a diff stat of changes that haven't been > checked in yet. I was doing a "git log -p origin.. | diffstat -p1", > and in that incantation you definitely do need the -p1 to diffstat. You should *always* use "-p1" to diffst

Re: [GIT PULL] ext4 update

2008-01-30 Thread Paul Collins
Theodore Tso <[EMAIL PROTECTED]> writes: > On Tue, Jan 29, 2008 at 10:54:03PM +0100, Jan Engelhardt wrote: >> >> I am seeing normal behavior: >> >> 22:52 sovereign:~/linux > git diff HEAD | diffstat > > That's because you are doing a diff stat of changes that haven't been > checked in yet. I was

Re: [GIT PULL] ext4 update

2008-01-29 Thread Theodore Tso
On Tue, Jan 29, 2008 at 10:54:03PM +0100, Jan Engelhardt wrote: > > On Jan 29 2008 07:53, Theodore Tso wrote: > > > >>fwiw, diffstat is confused by git's diff output; you need to use > >>'diffstat -p1' > > I am seeing normal behavior: > > 22:52 sovereign:~/linux > git diff HEAD | diffstat That's

Re: [GIT PULL] ext4 update

2008-01-29 Thread Jan Engelhardt
On Jan 29 2008 07:53, Theodore Tso wrote: > >>fwiw, diffstat is confused by git's diff output; you need to use >>'diffstat -p1' I am seeing normal behavior: 22:52 sovereign:~/linux > git status # On branch dev-pcidata-dvb # Changes to be committed: # (use "git reset HEAD ..." to unstage) # #

Re: [GIT PULL] ext4 update

2008-01-29 Thread Theodore Tso
>fwiw, diffstat is confused by git's diff output; you need to use >'diffstat -p1' Argh, I have *got* to create a script that does this automatically. Revised diffstat -p1 output follows... - Ted Documentation/filesystems/ext4.txt | 20

Re: [GIT PULL] ext4 update

2007-10-25 Thread Andrew Morton
On Thu, 25 Oct 2007 16:44:21 -0700 (PDT) Linus Torvalds <[EMAIL PROTECTED]> wrote: > > > On Thu, 25 Oct 2007, Andrew Morton wrote: > > > > There shouldn't have been conflicts here - if there were I wouldn't have > > sent those patches. Unless there were things in the ext4 pull which > > weren'

Re: [GIT PULL] ext4 update

2007-10-25 Thread Linus Torvalds
On Thu, 25 Oct 2007, Andrew Morton wrote: > > There shouldn't have been conflicts here - if there were I wouldn't have > sent those patches. Unless there were things in the ext4 pull which > weren't present in the ext4 quilt tree which I included in 2.6.23-mm1? Well, you merge your patch-serie

Re: [GIT PULL] ext4 update

2007-10-25 Thread Andrew Morton
On Wed, 17 Oct 2007 08:59:53 -0700 (PDT) Linus Torvalds <[EMAIL PROTECTED]> wrote: > On Wed, 17 Oct 2007, Theodore Ts'o wrote: > > > > Please pull from: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git > > for_linus > > This conflicts in nontrivial ways with > >

Re: [GIT PULL] ext4 update

2007-10-17 Thread Andreas Dilger
On Oct 16, 2007 21:51 -0700, [EMAIL PROTECTED] wrote: > On Wed, 17 Oct 2007, Theodore Ts'o wrote: > >It has a number random cleanups and bug fixes, and two new features. > >The first is uninitialized block groups, which allows fast mke2fs > >operations plus as well as speeding up e2fsck by allowin

Re: [GIT PULL] ext4 update

2007-10-17 Thread Theodore Tso
On Wed, Oct 17, 2007 at 08:59:53AM -0700, Linus Torvalds wrote: > > Please pull from: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git > > for_linus > > This conflicts in nontrivial ways with > > which I just merged from -mm. > > I suspect it's trivial to fix up for

Re: [GIT PULL] ext4 update

2007-10-17 Thread Linus Torvalds
On Wed, 17 Oct 2007, Theodore Ts'o wrote: > > Please pull from: > > git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus This conflicts in nontrivial ways with commit 7c9e69faa28027913ee059c285a5ea8382e24b5d Author: Aneesh Kumar K.V <[EMAIL PROTECTED]

Re: [GIT PULL] ext4 update

2007-10-16 Thread david
On Wed, 17 Oct 2007, Theodore Ts'o wrote: Hi Linus, Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus It has a number random cleanups and bug fixes, and two new features. The first is uninitialized block groups, which allows fast mke2fs operations