linux-kernel - 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20080229153958.fc34e281.sfr@canb.auug.org.au>
Date:	Fri, 29 Feb 2008 15:39:58 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Matthew Wilcox <matthew@....cx>
Cc:	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
	Haavard Skinnemoen <hskinnemoen@...el.com>,
	Greg KH <greg@...ah.com>, Mark Fasheh <mark.fasheh@...cle.com>
Subject: linux-next: semaphore update merge conflicts

Hi Willy,

Not as bad as I thought it might be!  :-)

The merge had the following conflicts:

	Documentation/feature-removal-schedule.txt
		Conflicts with the ocfs2 tree - trivial to fix.
	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).
	include/linux/memory.h
		the driver-core changed the semaphore in here to a mutex,
		so the change from asm/semaphore.h to linux/semaphore.h
		is no longer needed.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped