linux-kernel - Re: [git pull] Input patches for 2.6.20

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.0.98.0705041806210.3808@woody.linux-foundation.org>
Date:	Fri, 4 May 2007 18:19:49 -0700 (PDT)
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Dmitry Torokhov <dtor@...ightbb.com>, Greg KH <gregkh@...e.de>,
	Martin Schwidefsky <schwidefsky@...ibm.com>
cc:	Andrew Morton <akpm@...ux-foundation.org>,
	LKML <linux-kernel@...r.kernel.org>
Subject: Re: [git pull] Input patches for 2.6.20

On Thu, 3 May 2007, Dmitry Torokhov wrote:
> 
> If you have not pulled yet please pull from:
>
> �� �� �� �� master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git for-linus
> 
> because master branch will have extra stuff in the next minute or so.

Hmm. That thing had a conflict with the driver core changes I just pulled 
from Greg due to Greg removing "struct subsystem".

The conflict looked really trivial, and I fixed up the obvious places, 
probably correctly. Please verify.

Martin, in the process I noticed that the new file

	arch/s390/kernel/ipl.c

seems to be broken by the same thing after the driver core merge. The fix 
_looks_ equally trivial (change *subsys.kset.kobj into just *subsys.kobj), 
but I didn't do that trivial thing, because I cannot even test-compile the 
end result. So can you give it a quick look, please?

Greg - maybe more of a heads-up to people next time you do something like 
this? Did this removal hit -mm? Anyway, it looks like something trivial to 
fix up after, but ..

		Linus