linux-kernel - Re: [GIT PATCH] kbuild updates

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.1.00.0801290901340.3505@www.l.google.com>
Date:	Tue, 29 Jan 2008 09:04:38 +1100 (EST)
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Sam Ravnborg <sam@...nborg.org>
cc:	Andrew Morton <akpm@...ux-foundation.org>,
	LKML <linux-kernel@...r.kernel.org>,
	linux-kbuild <linux-kbuild@...r.kernel.org>,
	Paul Mundt <lethal@...ux-sh.org>
Subject: Re: [GIT PATCH] kbuild updates

On Mon, 28 Jan 2008, Sam Ravnborg wrote:
> 
> Please pull following patches for kbuild/kconfig and a few other areas.
> 
> Pull from:
> 	ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git

This conflicts with the SH updates (sh is also integrating 32/64-bit into 
one tree now).

Since I don't know the SH tree or your changes, the probably fairly 
trivial manual merge isn't an option (especially as I'm not at home and 
doing this on a laptop with a less than ideal keyboard and smaller screen 
than I'm used to).

So I hope you and Paul can resolve the conflicts and re-send.

		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/