All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jiri Kosina <jikos@jikos.cz>, linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the hid tree
Date: Sun, 24 Aug 2008 21:49:56 -0700	[thread overview]
Message-ID: <20080825044956.GA3959@kroah.com> (raw)
In-Reply-To: <20080825142631.3171068e.sfr@canb.auug.org.au>

On Mon, Aug 25, 2008 at 02:26:31PM +1000, Stephen Rothwell wrote:
> Hi Jiri,
> 
> Today's linux-next merge of the hid tree got a conflict in
> drivers/hid/usbhid/hid-core.c between commit
> 42c057049eb3ca9bad38fb0acc6290771a11d9ff ("USB: remove warn() macro from
> usb.h") from the usb tree and commit
> 128fc1f24bbb042b8d586dfba4db9ee7caac52bd ("HID: indent switches/cases")
> from the hid tree.
> 
> I did the obvious fixups (see below).
> 
> Jiri, you should be able to apply the appropriate part of Greg's patch to
> your tree as it only depends on stuff that is already in Linus' tree.  I
> have added that partial patch below. (Greg, do you want to Sign-off on
> that, please?)  (I don't mind if the patch is in both trees - Greg you
> might consider breaking up those warn() and info() (and err()?) removal
> patches and sending them to the appropriate maintainers.)

They are going to get split up and sent to them later this week.

thanks,

greg k-h

  reply	other threads:[~2008-08-25  6:20 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-25  4:26 linux-next: manual merge of the hid tree Stephen Rothwell
2008-08-25  4:49 ` Greg KH [this message]
2008-08-25  6:26   ` Stephen Rothwell
2008-08-26  8:50   ` Jiri Kosina
2008-08-26 12:42     ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
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-10-14  6:51 Stephen Rothwell
2008-10-14  7:12 ` Jiri Kosina
2008-10-14 13:54   ` Greg KH
2008-10-16  3:49 Stephen Rothwell
2008-10-16  9:34 ` Jiri Kosina
2008-10-16 23:27   ` 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=20080825044956.GA3959@kroah.com \
    --to=greg@kroah.com \
    --cc=jikos@jikos.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.