linux-kernel - Re: [GIT PULL] ext4 update

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LFD.0.999.0710251643120.30120@woody.linux-foundation.org>
Date:	Thu, 25 Oct 2007 16:44:21 -0700 (PDT)
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Andrew Morton <akpm@...ux-foundation.org>
cc:	tytso@....edu, linux-ext4@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] ext4 update



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-series by patching.

You should have noticed by now that GNU patch in particular will happily 
apply a patch whether it conflicts or not. So it's entirely possible that 
it didn't conflict for you, but applied cleanly and sanely.

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