linux-kernel - Re: [GIT PULL] Disintegrate UAPI for parisc [ver #2]

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 for Android: free password hash cracker in your pocket

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

Message-ID: <31900.1350414486@warthog.procyon.org.uk>
Date:	Tue, 16 Oct 2012 20:08:06 +0100
From:	David Howells <dhowells@...hat.com>
To:	James Bottomley <James.Bottomley@...senPartnership.com>
Cc:	dhowells@...hat.com, jejb@...isc-linux.org,
	linux-parisc@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] Disintegrate UAPI for parisc [ver #2]

James Bottomley <James.Bottomley@...senPartnership.com> wrote:

> I'm getting a fairly massive merge failure over our misc tree:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.0 misc
> 
> It looks like a conflict with the motion to using wrappered Kbuild for
> our asm-generic clones.

I can try merging your branch in and then disintegrating on top of that.

David
--
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/