linux-kernel - Re: linux-next: semaphore update merge conflicts

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20080229111731.13840877@hskinnemoen.norway.atmel.com>
Date:	Fri, 29 Feb 2008 11:17:31 +0100
From:	Haavard Skinnemoen <hskinnemoen@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Matthew Wilcox <matthew@....cx>, linux-next@...r.kernel.org,
	LKML <linux-kernel@...r.kernel.org>, Greg KH <greg@...ah.com>,
	Mark Fasheh <mark.fasheh@...cle.com>
Subject: Re: linux-next: semaphore update merge conflicts

On Fri, 29 Feb 2008 15:39:58 +1100
Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> 	arch/avr32/kernel/semaphore.c
> 		the avr32 tree appeared to just change spaces to tabs
> 		in this file so I removed it (as your changes did).

I yanked that change out of my tree. No point cleaning up that file if
it's going away.

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