Re: 2.6.18-rc6-mm1

[Chuck Ebbert]

In-Reply-To: <20060911102328.861a64b3.akpm@xxxxxxxx>

On Mon, 11 Sep 2006 10:23:28 -0700, Andrew Morton wrote:

> wget ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.18-rc6.tar.bz2
> wget ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.18-rc6/2.6.18-rc6-mm1/2.6.18-rc6-mm1-broken-out.tar.gz
> box:/home/akpm> mkdir aa
> box:/home/akpm> cd aa
> box:/home/akpm/aa> tar xfj ../linux-2.6.18-rc6.tar.bz2 
> box:/home/akpm/aa> cd linux-2.6.18-rc6 
> box:/home/akpm/aa/linux-2.6.18-rc6> tar xfz ../../2.6.18-rc6-mm1-broken-out.tar.gz
> box:/home/akpm/aa/linux-2.6.18-rc6> mv broken-out patches
> box:/home/akpm/aa/linux-2.6.18-rc6> quilt push -a > /dev/null
> box:/home/akpm/aa/linux-2.6.18-rc6> quilt applied | wc -l
> 1835

I found the problem:

$ set | fgrep QUILT
QUILT_DIFF_OPTS=-p
QUILT_PATCH_OPTS=--fuzz=0
                 ^^^^^^^^

Your patchset does have conflicts -- you're just ignoring them
by accepting fuzz (and patch hunks can even end up being applied
at the wrong place.)

-- 
Chuck

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