linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alan Stern <stern@rowland.harvard.edu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the usb tree
Date: Mon, 7 Jul 2008 10:09:33 -0400 (EDT)	[thread overview]
Message-ID: <Pine.LNX.4.44L0.0807071008550.2581-100000@iolanthe.rowland.org> (raw)
In-Reply-To: <20080707130941.53fe052f.sfr@canb.auug.org.au>

On Mon, 7 Jul 2008, Stephen Rothwell wrote:

> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/core/hub.c between commit
> 09ca8adbe9f724a7e96f512c0039c4c4a1c5dcc0 ("Revert "USB: don't explicitly
> reenable root-hub status interrupts"") from Linus' tree and commit
> hub_events ("USB: simplify hub_restart() logic") from the usb tree.
> 
> I fixed it up but definitely worth a check to make sure that the end of
> hub_events() still make sense.

The reversion and the fix don't show up at git.kernel.org, so I can't 
check them.

Alan Stern

  reply	other threads:[~2008-07-07 14:09 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-07  3:09 linux-next: manual merge of the usb tree Stephen Rothwell
2008-07-07 14:09 ` Alan Stern [this message]
2008-07-07 16:09   ` Stephen Rothwell
2008-07-16  2:02 Stephen Rothwell
2008-07-16  2:30 ` Greg KH
2008-07-16  7:06 ` Jaswinder Singh
2008-07-16  7:13   ` Stephen Rothwell
2008-07-16  7:20     ` Jaswinder Singh
2008-07-16  7:45       ` Stephen Rothwell
2008-07-16  7:49         ` Jaswinder Singh
2008-07-16  7:58           ` Stephen Rothwell
2008-07-17  0:54 Stephen Rothwell
2008-07-17  7:04 ` Greg KH
2008-10-14  3:27 Stephen Rothwell
2008-10-14  3:31 Stephen Rothwell
2008-10-14  5:44 ` Alexey Klimov
2008-10-14  3:37 Stephen Rothwell
2008-10-14  3:47 Stephen Rothwell
2008-10-14  3:53 Stephen Rothwell
2008-11-10  1:06 Stephen Rothwell
2008-11-10  1:40 ` Greg KH
2013-10-22 15:08 linux-next: Tree for Oct 22 Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the usb tree Thierry Reding
2013-10-22 18:02   ` Srinivas Pandruvada

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=Pine.LNX.4.44L0.0807071008550.2581-100000@iolanthe.rowland.org \
    --to=stern@rowland.harvard.edu \
    --cc=greg@kroah.com \
    --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).