All of lore.kernel.org
 help / color / mirror / Atom feed
From: Olof Johansson <olof@lixom.net>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: ARM SoC <arm@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	"linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>
Subject: Re: [GIT PULL 5/7] ARM: SoC driver updates
Date: Tue, 17 Feb 2015 09:57:13 -0800	[thread overview]
Message-ID: <CAOesGMjnUAt5MuXqN19ggT2H8vMQKMvArGx_TgAto2prPNmiXw@mail.gmail.com> (raw)
In-Reply-To: <CA+55aFz1i4M4GYOpPp4UAQPGx7b0PTd9Uv0gctU6EMKe3kb4wA@mail.gmail.com>

On Tue, Feb 17, 2015 at 9:41 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Tue, Feb 17, 2015 at 12:33 AM, Olof Johansson <olof@lixom.net> wrote:
>>
>> Conflicts:
>>
>> arch/arm/boot/dts/rk3288.dtsi:  add/add: Keep both sides
> ...
>
> You mixed up the aliases of this pull and the previous DT pull.
>
> Not a real problem, but while resolving the DT aliases (which you
> claimed had "No conflicts") I was wondering just what you had been
> doing..

Whoops, sorry for that. I took merge conflict notes in a separate
window and copied and pasted, and did it into the wrong email.


-Olof

WARNING: multiple messages have this Message-ID (diff)
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 5/7] ARM: SoC driver updates
Date: Tue, 17 Feb 2015 09:57:13 -0800	[thread overview]
Message-ID: <CAOesGMjnUAt5MuXqN19ggT2H8vMQKMvArGx_TgAto2prPNmiXw@mail.gmail.com> (raw)
In-Reply-To: <CA+55aFz1i4M4GYOpPp4UAQPGx7b0PTd9Uv0gctU6EMKe3kb4wA@mail.gmail.com>

On Tue, Feb 17, 2015 at 9:41 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Tue, Feb 17, 2015 at 12:33 AM, Olof Johansson <olof@lixom.net> wrote:
>>
>> Conflicts:
>>
>> arch/arm/boot/dts/rk3288.dtsi:  add/add: Keep both sides
> ...
>
> You mixed up the aliases of this pull and the previous DT pull.
>
> Not a real problem, but while resolving the DT aliases (which you
> claimed had "No conflicts") I was wondering just what you had been
> doing..

Whoops, sorry for that. I took merge conflict notes in a separate
window and copied and pasted, and did it into the wrong email.


-Olof

  reply	other threads:[~2015-02-17 17:57 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-17  8:33 [GIT PULL 0/7] ARM: SoC changes for 3.20 Olof Johansson
2015-02-17  8:33 ` Olof Johansson
2015-02-17  8:33 ` [GIT PULL 1/7] ARM: SoC non-critical fixes Olof Johansson
2015-02-17  8:33   ` Olof Johansson
2015-02-17  8:33 ` [GIT PULL 2/7] ARM: SoC cleanups Olof Johansson
2015-02-17  8:33   ` Olof Johansson
2015-02-17  8:33 ` [GIT PULL 3/7] ARM: SoC platform changes Olof Johansson
2015-02-17  8:33   ` Olof Johansson
2015-02-17  8:33 ` [GIT PULL 4/7] ARM: SoC DT updates Olof Johansson
2015-02-17  8:33   ` Olof Johansson
2015-02-17  8:33 ` [GIT PULL 5/7] ARM: SoC driver updates Olof Johansson
2015-02-17  8:33   ` Olof Johansson
2015-02-17 17:41   ` Linus Torvalds
2015-02-17 17:41     ` Linus Torvalds
2015-02-17 17:57     ` Olof Johansson [this message]
2015-02-17 17:57       ` Olof Johansson
2015-02-17  8:33 ` [GIT PULL 6/7] ARM: SoC defconfig changes Olof Johansson
2015-02-17  8:33   ` Olof Johansson
2015-02-17  8:33 ` [GIT PULL 7/7] ARM: SoC 64-bit changes and additions Olof Johansson
2015-02-17  8:33   ` Olof Johansson
2017-05-09  6:52 [GIT PULL 0/7] ARM: SoC contents for 4.12 merge window Olof Johansson
2017-05-09  6:52 ` [GIT PULL 5/7] ARM: SoC driver updates Olof Johansson
2017-05-09  6:52   ` Olof Johansson
2017-07-04 14:24 Arnd Bergmann
2017-07-04 14:24 ` Arnd Bergmann
2017-07-04 21:53 ` Linus Torvalds
2017-07-04 21:53   ` Linus Torvalds
2017-07-05 12:31   ` Arnd Bergmann
2017-07-05 12:31     ` Arnd Bergmann

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=CAOesGMjnUAt5MuXqN19ggT2H8vMQKMvArGx_TgAto2prPNmiXw@mail.gmail.com \
    --to=olof@lixom.net \
    --cc=arm@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.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 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.