public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Stephen Rothwell' <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	'Stephen Warren' <swarren@nvidia•com>,
	'Olof Johansson' <olof@lixom•net>,
	'Arnd Bergmann' <arnd@arndb•de>,
	linux-arm-kernel@lists•infradead.org
Subject: RE: linux-next: manual merge of the samsung tree with the arm-soc tree
Date: Wed, 16 Jan 2013 20:06:59 -0800	[thread overview]
Message-ID: <0c7d01cdf468$1ad400d0$507c0270$@samsung.com> (raw)
In-Reply-To: <20130117145324.3f1f27fb5902b5a03135bf06@canb.auug.org.au>

Stephen Rothwell wrote:
> 
> Hi Kukjin,
> 
Hi,

> On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell <sfr@canb•auug.org.au>
> wrote:
> >
> > Today's linux-next merge of the samsung tree got conflicts in
> > many files with the arm-soc tree.
> >
> > I just dropped the samsung tree for today.  Please have a look and try
to
> > fix this mess up, thanks.
> 
> Ping?
> 
Oops, I missed above e-mail. Anyway, really?

Let me look at soon and I will fix.

Thanks for your information.

- Kukjin

next prev parent reply	other threads:[~2013-01-17  4:06 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-11  4:32 linux-next: manual merge of the samsung tree with the arm-soc tree Stephen Rothwell
2013-01-17  3:53 ` Stephen Rothwell
2013-01-17  4:06   ` Kukjin Kim [this message]
2013-01-17  4:10   ` Kukjin Kim
2013-01-17  5:02   ` Kukjin Kim
2013-01-17  5:13   ` Kukjin Kim
2013-01-17  5:59     ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2014-07-21  1:13 Stephen Rothwell
2014-07-17  2:06 Stephen Rothwell
2014-07-17  2:01 Stephen Rothwell
2014-07-17  1:54 Stephen Rothwell
2014-05-26  0:17 Stephen Rothwell
2014-05-26  0:37 ` Stephen Rothwell
2014-03-23 23:30 Stephen Rothwell
2013-04-05  5:02 Stephen Rothwell
2013-04-05  6:49 ` Kukjin Kim
2013-02-13  7:39 Stephen Rothwell
2013-01-30 14:48 Stephen Rothwell
2013-01-30 14:48 Stephen Rothwell
2013-02-09 14:20 ` Grant Likely
2013-01-18  3:28 Stephen Rothwell
2013-01-18  3:24 Stephen Rothwell
2013-01-18  3:21 Stephen Rothwell
2013-01-11  4:18 Stephen Rothwell
2012-11-26 11:19 Stephen Rothwell
2012-11-26 11:15 Stephen Rothwell
2012-09-24 10:52 Stephen Rothwell

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='0c7d01cdf468$1ad400d0$507c0270$@samsung.com' \
    --to=kgene.kim@samsung$(echo .)com \
    --cc=arnd@arndb$(echo .)de \
    --cc=linux-arm-kernel@lists$(echo .)infradead.org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=olof@lixom$(echo .)net \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=swarren@nvidia$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox