linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Anatolij Gustschin <agust@denx.de>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev <linuxppc-dev@lists.ozlabs.org>
Subject: Re: Please pull 'next' branch of 5xxx tree
Date: Wed, 29 Jan 2014 21:50:19 +0100	[thread overview]
Message-ID: <20140129215019.0a531a49@crub> (raw)
In-Reply-To: <1390981569.8524.53.camel@pasglop>

Hi Ben !

On Wed, 29 Jan 2014 18:46:09 +1100
Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
...
> Hrm, I get a merge conflicts with spi-mpc512x-psc.c, please check that I
> fixed it up properly in powerpc-next and let me know.

your fix is correct.

Thanks,

Anatolij

  parent reply	other threads:[~2014-01-29 20:50 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-15 21:18 Please pull 'next' branch of 5xxx tree Anatolij Gustschin
2014-01-28  5:46 ` Anatolij Gustschin
2014-01-28  6:00   ` Benjamin Herrenschmidt
2014-01-28  6:22     ` Anatolij Gustschin
2014-01-29  7:46     ` Benjamin Herrenschmidt
2014-01-29 10:11       ` Gerhard Sittig
2014-01-29 20:50       ` Anatolij Gustschin [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-11-04  0:11 Anatolij Gustschin
2013-09-03 20:39 Anatolij Gustschin
2013-09-05  6:50 ` Benjamin Herrenschmidt
2013-09-09  9:38   ` Anatolij Gustschin
2013-07-01 22:36 Anatolij Gustschin
2013-07-02  7:46 ` Benjamin Herrenschmidt
2013-07-02  8:00   ` Anatolij Gustschin
2013-07-02  8:29     ` Benjamin Herrenschmidt
2013-07-02 10:29     ` Benjamin Herrenschmidt
2013-07-02 10:35       ` Anatolij Gustschin
2013-04-29  9:42 Anatolij Gustschin
2013-02-19 23:57 Anatolij Gustschin
2012-12-11  8:23 Anatolij Gustschin
2012-09-24 14:45 Anatolij Gustschin
2012-03-20 17:04 Anatolij Gustschin
2012-03-20 22:30 ` Wolfram Sang
2012-03-20 23:32   ` Benjamin Herrenschmidt
2012-03-21  0:18     ` Anatolij Gustschin
2012-03-21 14:08       ` Stephen Rothwell
2012-03-21  0:56   ` Anatolij Gustschin
2011-09-30  6:31 Heiko Schocher
2011-09-30  6:38 ` Heiko Schocher
2011-09-29  9:30 Anatolij Gustschin
2011-09-29 12:49 ` Grant Likely
2011-09-22 23:20 Anatolij Gustschin
2011-09-23  0:15 ` Benjamin Herrenschmidt

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=20140129215019.0a531a49@crub \
    --to=agust@denx.de \
    --cc=benh@kernel.crashing.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    /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).