linux-kernel - Re: [GIT PATCH] STAGING patches for 3.1

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: <CA+55aFwOgkOXmY654-qbuiFFnUC1yXZ27DBDFR02JP12NxAF9w@mail.gmail.com>
Date:	Mon, 25 Jul 2011 23:31:48 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Greg KH <greg@...ah.com>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-kernel@...r.kernel.org, devel@...uxdriverproject.org
Subject: Re: [GIT PATCH] STAGING patches for 3.1

On Mon, Jul 25, 2011 at 10:15 PM, Greg KH <greg@...ah.com> wrote:
>
> Note, I have not successfully merged this with your tree yet, the
> diffstat below is against the 3.0-rc6 tree.  When merging with your
> tree, there are a number of merge issues that I trust you can resolve
> easier than I can.  If you have problems, please let me know and I will
> fix them up on Wednesday when I get done driving to my next hotel
> location.

No problem, some of the merge conflicts looked a bit ugly, but they
were all trivial. Most of them was due to some trivial removed or
added #include lines, and it just then clashed with your much bigger
changes. Easy enough to sort out, and in couple of cases the bigger
changes had just made the small changes irrelevant too.

So all merged and pushed out. Of course, maybe I made a mistake
somewhere, but none of it looked at all questionable (famous last
words ;)

                   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/