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,
Lukasz Majewski <l.majewski@samsung•com>,
Kyungmin Park <kyungmin.park@samsung•com>,
Kukjin Kim <kgene.kim@samsung•com>
Subject: Re: linux-next: manual merge of the usb tree with the s5p tree
Date: Fri, 18 May 2012 08:21:07 -0700 [thread overview]
Message-ID: <20120518152107.GA10274@kroah.com> (raw)
In-Reply-To: <20120518172224.abd97797bab5d99eaeec97a5@canb.auug.org.au>
On Fri, May 18, 2012 at 05:22:24PM +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 3a36dd068f43 ("ARM: EXYNOS: Add s3c-hsotg
> device support for Universal C210 board") from the usb tree.
>
> 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-18 15:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 7:22 linux-next: manual merge of the usb tree with the s5p tree Stephen Rothwell
2012-05-18 15:21 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-05-16 8:03 Stephen Rothwell
2012-05-16 12:06 ` Greg KH
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=20120518152107.GA10274@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=kgene.kim@samsung$(echo .)com \
--cc=kyungmin.park@samsung$(echo .)com \
--cc=l.majewski@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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