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

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]

Date:	Fri, 08 Dec 2006 12:59:44 +0100
From:	Marcel Holtmann <marcel@...tmann.org>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	Dmitry Torokhov <dtor@...ightbb.com>,
	Linus Torvalds <torvalds@...l.org>,
	LKML <linux-kernel@...r.kernel.org>,
	Andrew Morton <akpm@...l.org>, Greg KH <gregkh@...e.de>
Subject: Re: [git pull] Input patches for 2.6.19

Hi Jiri,

> >  b/drivers/usb/input/hid-core.c                 |    7 
> >  b/drivers/usb/input/hid-input.c                |    4 
> >  b/drivers/usb/input/hid.h                      |    1 
> 
> OK, this is going to break the merge from Greg's tree of generic HID 
> layer, which was planned for today.
> 
> The merge will probably emit a large .rej files, due to the large blocks 
> of code being moved around, but it seems that most of the changes which 
> would conflict with the merge could be trivially solved by hand.
> 
> Greg, should I prepare a new version of the generic HID patches against 
> merged Linus' + Dmitry's trees and send them to you?

yes please, because Linus already merged Dmitry's patches.

Regards

Marcel


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