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
>
> commit 7c9e69faa28027913ee059c285a5ea8382e24b5d
> Author: Aneesh Kumar K.V <[email protected]>
> Date: Tue Oct 16 23:27:02 2007 -0700
>
> ext2/ext3/ext4: add block bitmap validation
>
> which I just merged from -mm.
<catching up>
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?
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
