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,
Marek Szyprowski <m.szyprowski@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Kukjin Kim <kgene.kim@samsung.com>,
Lukasz Majewski <l.majewski@samsung.com>
Subject: Re: linux-next: manual merge of the usb tree with the s5p tree
Date: Wed, 16 May 2012 05:06:44 -0700 [thread overview]
Message-ID: <20120516120644.GA31261@kroah.com> (raw)
In-Reply-To: <20120516180303.3c3cff646c1a70a8ddf32e2a@canb.auug.org.au>
On Wed, May 16, 2012 at 06:03:03PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-exynos/mach-universal_c210.c between commit 6dafa4aead1b
> ("ARM: EXYNOS: Add DRM core device support for Universal C210 board")
> from the s5p tree and commit 126625e1bf32 ("usb:hsotg:samsung:cosmetic
> Move <linux/platform_data/s3c-hsotg.h> to proper place") from the usb
> tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2012-05-16 12:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-16 8:03 linux-next: manual merge of the usb tree with the s5p tree Stephen Rothwell
2012-05-16 12:06 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-05-18 7:22 Stephen Rothwell
2012-05-18 15:21 ` Greg KH
2012-05-14 7:47 Stephen Rothwell
2012-05-14 7:47 ` Stephen Rothwell
2012-05-14 14:28 ` Greg KH
2011-04-14 4:15 Stephen Rothwell
2011-04-14 4:52 ` Greg KH
2011-03-11 6:09 Stephen Rothwell
2011-03-11 6:39 ` Lars-Peter Clausen
2011-03-11 7:19 ` Kukjin Kim
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=20120516120644.GA31261@kroah.com \
--to=greg@kroah.com \
--cc=kgene.kim@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=l.majewski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--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.