linux-kernel.vger.kernel.org archive mirror
 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,
	Thierry Reding <thierry.reding@avionic-design.de>,
	Hiroshi Doyu <hdoyu@nvidia.com>, Joerg Roedel <joro@8bytes.org>,
	David Woodhouse <dwmw2@infradead.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the iommu tree
Date: Tue, 5 Feb 2013 22:03:27 -0800	[thread overview]
Message-ID: <20130206060327.GA3352@kroah.com> (raw)
In-Reply-To: <20130206162523.c338c51f0d5fc31b20245184@canb.auug.org.au>

On Wed, Feb 06, 2013 at 04:25:23PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/iommu/tegra-smmu.c between commit a6870e928d1b ("iommu/tegra:
> smmu: Support variable MMIO ranges/blocks") from the iommu tree and
> commit bc5e6dea81b0 ("iommu: Convert to devm_ioremap_resource()") from
> the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.

greg k-h

  reply	other threads:[~2013-02-06  6:01 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-06  5:25 linux-next: manual merge of the driver-core tree with the iommu tree Stephen Rothwell
2013-02-06  6:03 ` Greg KH [this message]
2014-05-28  7:55 Stephen Rothwell
2014-05-28 18:35 ` Greg KH
2018-07-11  3:14 Stephen Rothwell
2018-07-11 10:58 ` Greg KH
2018-08-19  0:28 ` Stephen Rothwell
2023-04-17 16:09 broonie
2023-04-18  6:21 ` 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=20130206060327.GA3352@kroah.com \
    --to=greg@kroah.com \
    --cc=dwmw2@infradead.org \
    --cc=hdoyu@nvidia.com \
    --cc=joro@8bytes.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=thierry.reding@avionic-design.de \
    /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).