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: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Alan Stern <stern@rowland.harvard.edu>,
	Stephen Warren <swarren@wwwdotorg.org>,
	Venu Byravarasu <vbyravarasu@nvidia.com>
Subject: Re: linux-next: manual merge of the usb tree with the usb.current tree
Date: Mon, 7 May 2012 09:05:05 -0700	[thread overview]
Message-ID: <20120507160505.GA23505@kroah.com> (raw)
In-Reply-To: <20120503144410.3aab6165a98e4f36bf50fcf5@canb.auug.org.au>

On Thu, May 03, 2012 at 02:44:10PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-tegra.c between commit ebf20de45304 ("EHCI: update
> PM methods in ehci-tegra.c") from the usb.current tree and commit
> fe375774bd88 ("usb: host: tegra: code clean up") from the usb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

This should now be resolved in my tree.

thanks,

greg k-h

  parent reply	other threads:[~2012-05-07 16:05 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-03  4:44 linux-next: manual merge of the usb tree with the usb.current tree Stephen Rothwell
2012-05-04 23:18 ` Greg KH
2012-05-07 16:05 ` Greg KH [this message]
2012-05-07 16:05 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2024-04-26  4:48 Stephen Rothwell
2024-04-26 21:39 ` Thinh Nguyen
2024-04-12  4:25 Stephen Rothwell
2024-04-12  7:58 ` Greg KH
2024-04-24  6:12   ` Stephen Rothwell
2024-04-30 16:11     ` Greg KH
2024-02-20  3:39 Stephen Rothwell
2024-02-20  8:18 ` Greg KH
2024-02-26  5:55 ` Greg KH
2023-05-15  2:50 Stephen Rothwell
2023-05-28 14:28 ` Greg KH
2023-05-15  2:35 Stephen Rothwell
2023-05-15  3:50 ` Greg KH
2023-05-15  5:22 ` Krishna Kurapati PSSNV
2023-05-15 11:01 ` Roger Quadros
2023-05-15 11:36   ` Stephen Rothwell
2023-05-28 14:28   ` Greg KH
2023-05-28 15:48     ` Roger Quadros
2023-05-28 16:07       ` Greg KH
2023-03-31  3:01 Stephen Rothwell
2023-03-31  7:52 ` Greg KH
2023-04-10  6:56 ` Greg KH
2023-01-19  3:48 Stephen Rothwell
2023-01-18  0:56 Stephen Rothwell
2023-01-18  7:48 ` Greg KH
2023-01-23 14:40 ` Greg KH
2022-09-01  3:52 Stephen Rothwell
2022-09-05  6:04 ` Greg KH
2022-04-26  5:08 Stephen Rothwell
2022-04-26  9:41 ` Greg KH
2022-05-03 14:36 ` Greg KH
2022-02-21 20:39 broonie
2022-02-22  7:44 ` Greg KH
2021-07-22  4:12 Stephen Rothwell
2021-07-23 12:29 ` Greg KH
2021-07-27 14:45 ` Greg KH
2021-01-20  2:06 Stephen Rothwell
2021-01-20  8:02 ` Greg KH
2021-01-06  0:50 Stephen Rothwell
2021-01-11  7:11 ` Greg KH
2020-06-26  3:29 Stephen Rothwell
2020-06-26 15:14 ` Greg KH
2020-06-29  6:23 ` Greg KH
2018-06-29  4:57 Stephen Rothwell
2018-07-01  8:43 ` Greg KH
2018-07-01 15:11   ` Randy Dunlap
2018-04-23  3:04 Stephen Rothwell
2018-04-23  8:30 ` Johan Hovold
2018-04-23  8:41   ` Greg KH
2018-04-30  1:34 ` Stephen Rothwell
2018-04-30 11:55   ` Sebastian Reichel
2018-04-30 12:16     ` Greg KH
2018-04-30 12:00   ` Greg KH
2017-12-20  2:09 Stephen Rothwell
2017-12-20  9:36 ` Greg KH
2018-01-03  0:56   ` Stephen Rothwell
2018-01-04 16:06     ` Greg KH
2014-11-05  4:18 Stephen Rothwell
2014-11-05  4:30 ` Greg KH
2014-11-05  8:33   ` Paul Bolle
2014-11-06  2:19     ` Greg KH
2014-11-06  5:02       ` Stephen Rothwell
2013-12-18  5:53 Stephen Rothwell
2013-03-21  4:24 Stephen Rothwell
2012-11-14  4:07 Stephen Rothwell
2012-11-16  2:14 ` Greg KH
2012-11-13  3:37 Stephen Rothwell
2012-11-13 18:49 ` Greg KH
2012-10-25  2:05 Stephen Rothwell
2012-10-25  2:17 ` Greg KH
2012-09-12  5:37 Stephen Rothwell
2012-09-12 16:14 ` Greg KH
2012-09-12  5:37 Stephen Rothwell
2012-04-19  5:14 Stephen Rothwell
2012-04-19 20:07 ` Greg KH
2012-04-22 22:27 ` Greg KH
2012-03-05  6:00 Stephen Rothwell
2012-03-05 16:42 ` Greg KH
2011-08-25  4:52 Stephen Rothwell
2011-08-25 15:39 ` Greg KH
2011-08-29 15:52 ` Greg KH
2010-12-20  5:28 Stephen Rothwell
2010-12-20 18:30 ` Greg KH

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=20120507160505.GA23505@kroah.com \
    --to=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=stern@rowland.harvard.edu \
    --cc=swarren@wwwdotorg.org \
    --cc=vbyravarasu@nvidia.com \
    /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.