mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Marcel Holtmann <marcel@holtmann.org>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Dmitry Torokhov <dtor@insightbb.com>,
	Linus Torvalds <torvalds@osdl.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Andrew Morton <akpm@osdl.org>, Greg KH <gregkh@suse.de>
Subject: Re: [git pull] Input patches for 2.6.19
Date: Fri, 08 Dec 2006 12:59:44 +0100	[thread overview]
Message-ID: <1165579184.5529.33.camel@aeonflux.holtmann.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0612081038520.1665@twin.jikos.cz>

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



  reply	other threads:[~2006-12-08 10:59 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-08  6:57 Dmitry Torokhov
2006-12-08  9:50 ` Jiri Kosina
2006-12-08 11:59   ` Marcel Holtmann [this message]
2006-12-08 11:07     ` Andrew Morton
2006-12-08 11:51       ` Jiri Kosina
2006-12-08 13:06         ` Marcel Holtmann
2006-12-08 18:04           ` Greg KH
2006-12-08 14:14   ` Dmitry Torokhov
2006-12-08 15:54     ` Jiri Kosina

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1165579184.5529.33.camel@aeonflux.holtmann.net \
    --to=marcel@holtmann.org \
    --cc=akpm@osdl.org \
    --cc=dtor@insightbb.com \
    --cc=gregkh@suse.de \
    --cc=jkosina@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome