From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Joerg Roedel <joro@8bytes.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jean Delvare <jdelvare@suse.de>,
Cho KyongHo <pullip.cho@samsung.com>,
Shaik Ameer Basha <shaik.ameer@samsung.com>
Subject: linux-next: manual merge of the driver-core tree with the iommu tree
Date: Wed, 28 May 2014 17:55:31 +1000 [thread overview]
Message-ID: <20140528175531.4ce48afd@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 503 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/iommu/exynos-iommu.c between commit 7222e8db2d50
("iommu/exynos: Fix build errors") from the iommu tree and commit
8283b4919e00 ("driver core: dev_set_drvdata can no longer fail") from
the driver-core tree.
I fixed it up (the former removed the code changed by the latter) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-05-28 7:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-28 7:55 Stephen Rothwell [this message]
2014-05-28 18:35 ` linux-next: manual merge of the driver-core tree with the iommu tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2023-04-17 16:09 broonie
2023-04-18 6:21 ` Greg KH
2018-07-11 3:14 Stephen Rothwell
2018-07-11 10:58 ` Greg KH
2018-08-19 0:28 ` Stephen Rothwell
2013-02-06 5:25 Stephen Rothwell
2013-02-06 6:03 ` 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=20140528175531.4ce48afd@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=jdelvare@suse.de \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pullip.cho@samsung.com \
--cc=shaik.ameer@samsung.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 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).