linux-kernel - Re: linux-next: manual merge of the md-current tree with Linus' tree

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

Date:	Tue, 15 Dec 2009 10:57:20 +0100
From:	Arnd Bergmann <arnd@...db.de>
To:	Neil Brown <neilb@...e.de>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the md-current tree with Linus' tree

On Tuesday 15 December 2009, Neil Brown wrote:
> I had already rebased that patch on the lasted from Linus and asked him to
> pull again.
> He how seems to have done that, so md should be up-to-date in -linus,
> including the compat_ioctl stuff.
> If you would like to double check that it matches what you expect, that would
> be great.

The old ULONG_IOCTL numbers (HOT_{ADD,REMOVE}_DISK, SET_DISK_FAULTY
and SET_BITMAP_FILE) that Stephen missed are still left in fs/compat_ioctl.c,
but that is completely harmless. I'll remove them in my next batch of cleanups,
which can probably wait until 2.6.34.

Thanks for your help,

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