linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the hid tree
Date: Tue, 14 Oct 2008 06:54:07 -0700	[thread overview]
Message-ID: <20081014135407.GA11470@suse.de> (raw)
In-Reply-To: <alpine.LRH.1.10.0810140911030.8381@twin.jikos.cz>

On Tue, Oct 14, 2008 at 09:12:07AM +0200, Jiri Kosina wrote:
> On Tue, 14 Oct 2008, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the hid tree got a conflict in 
> > drivers/hid/hid-tmff.c between commits 
> > 454db62d208add27f30fcbcc00435768245407c9 ("USB: remove warn() macro from 
> > usb hid drivers") and 3e85ea87fdfbb9440dacda77b4de30472e0d38c9 ("USB: 
> > remove info() macro from usb HID drivers") from the usb tree 
> 
> Thanks Stephen for letting us know. These two patches should actually be 
> dropped from USB tree completely, I believe, as I have taken them through 
> my tree. Greg?

Yes, you are correct, I did not get the time to update my public tree
in the past few days due to other work :(

Should get to it today.

thanks,

greg k-h

  reply	other threads:[~2008-10-14 13:57 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-14  6:51 linux-next: manual merge of the hid tree Stephen Rothwell
2008-10-14  7:12 ` Jiri Kosina
2008-10-14 13:54   ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-10-16  3:49 Stephen Rothwell
2008-10-16  9:34 ` Jiri Kosina
2008-10-16 23:27   ` Stephen Rothwell
2008-08-25  4:46 Stephen Rothwell
2008-08-25 15:50 ` Dmitry Torokhov
2008-08-25 23:40   ` Stephen Rothwell
2008-08-27  3:10     ` Stephen Rothwell
2008-08-27 10:45       ` Jiri Kosina
2008-08-27 11:35         ` Stephen Rothwell
2008-08-25  4:26 Stephen Rothwell
2008-08-25  4:49 ` Greg KH
2008-08-25  6:26   ` Stephen Rothwell
2008-08-26  8:50   ` Jiri Kosina
2008-08-26 12:42     ` Stephen Rothwell

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=20081014135407.GA11470@suse.de \
    --to=gregkh@suse.de \
    --cc=jkosina@suse.cz \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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;
as well as URLs for NNTP newsgroup(s).