lkml.org 
[lkml]   [2010]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: -tip: origin tree build failure (was: [GIT PULL] ext4 update for 2.6.37)

* Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Thu, Oct 28, 2010 at 9:38 AM, Ingo Molnar <mingo@elte.hu> wrote:
> >
> > Point taken in any case, i'll read your edited changelog and will change the
> > template accordingly.
> >
> > Would this:
> >
> >  Upstream commit 5dabfc7 ("ext4: rename {exit,init}_ext4_*() to
> >  ext4_{exit,init}_*()"), breaks the build on all[yes/mod]config with
> >  CONFIG_EXT4_FS_XATTR disabled:
> >
> >  ...
> >
> > have been better?
>
> Yes. Except for the kernel the default git commit abbreviation is borderline too
> short. Seven hex-chars can easily alias with a few more pulls from me: git will
> not give aliases at the time it gives a shorthand, but a month or two later the
> abbreviated commit may no longer be unique.
>
> So I suggest using --abbrev=12 or similar.

ok. A helper script i use does this:

git log --pretty=format:"%h: %s" $@

I have added --abbrev=12. Might make sense to lengthen the %h default in upstream
Git as well?

> What I ended up writing your commit as was this:
>
> ext4: fix compile with CONFIG_EXT4_FS_XATTR disabled
>
> Commit 5dabfc78dced ("ext4: rename {exit,init}_ext4_*() to
> ext4_{exit,init}_*()") causes
>
> fs/ext4/super.c:4776: error: implicit declaration of function ‘ext4_init_xattr’
>
> when CONFIG_EXT4_FS_XATTR is disabled.
>
> It renamed init_ext4_xattr to ext4_init_xattr but forgot to update the
> dummy definition in fs/ext4/xattr.h.
>
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
> Acked-by: "Theodore Ts'o" <tytso@mit.edu>
> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
>
> but that's just me.

Ok, this indeed is much nicer to read.

Thanks,

Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2010-10-28 19:19    [W:1.488 / U:0.308 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site