All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: arm-soc <arm@kernel.org>,
	Linux ARM <linux-arm-kernel@lists.infradead.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL 5/7] ARM: SoC driver updates
Date: Wed, 5 Jul 2017 14:31:38 +0200	[thread overview]
Message-ID: <CAK8P3a0FhDgP8foc2EEmgA3g69SSXgPaZmt3bCW538gWKwWrBw@mail.gmail.com> (raw)
In-Reply-To: <CA+55aFyn0QFR3DYYaP2tOgxwYPzRgHfCmJ2fVXinZKsx_F8fBQ@mail.gmail.com>

On Tue, Jul 4, 2017 at 11:53 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Tue, Jul 4, 2017 at 7:24 AM, Arnd Bergmann <arnd@arndb.de> wrote:
>>  create mode 100644 drivers/soc/actions/Kconfig
>>  create mode 100644 drivers/soc/actions/Makefile
>>  create mode 100644 drivers/soc/actions/owl-sps-helper.c
>>  create mode 100644 drivers/soc/actions/owl-sps.c
>
> You already had these in the platform updates.

Yes, that was intentional. We had not originally decided which branch to send
first, so I asked Andreas to include the same commits in both branches.

The SMP support in arch/arm/mach-actions has a build-time dependency
on the code, so it needed to be in there, and the drivers branch simply
includes all the drivers/*/ changes.

In the past I sometimes generated the log in the pull request to match what
you are expected to see in the real merge, instead of the diff against mainline,
but now I only do that in case we have to do a backmerge for some reason
(most of the time we can avoid those, I think this time one of the pull requests
had a backmerge of 4.12-rc1..4.12-rc2).

Let me know if you would rather have us handle this differently.

      Arnd

WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 5/7] ARM: SoC driver updates
Date: Wed, 5 Jul 2017 14:31:38 +0200	[thread overview]
Message-ID: <CAK8P3a0FhDgP8foc2EEmgA3g69SSXgPaZmt3bCW538gWKwWrBw@mail.gmail.com> (raw)
In-Reply-To: <CA+55aFyn0QFR3DYYaP2tOgxwYPzRgHfCmJ2fVXinZKsx_F8fBQ@mail.gmail.com>

On Tue, Jul 4, 2017 at 11:53 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Tue, Jul 4, 2017 at 7:24 AM, Arnd Bergmann <arnd@arndb.de> wrote:
>>  create mode 100644 drivers/soc/actions/Kconfig
>>  create mode 100644 drivers/soc/actions/Makefile
>>  create mode 100644 drivers/soc/actions/owl-sps-helper.c
>>  create mode 100644 drivers/soc/actions/owl-sps.c
>
> You already had these in the platform updates.

Yes, that was intentional. We had not originally decided which branch to send
first, so I asked Andreas to include the same commits in both branches.

The SMP support in arch/arm/mach-actions has a build-time dependency
on the code, so it needed to be in there, and the drivers branch simply
includes all the drivers/*/ changes.

In the past I sometimes generated the log in the pull request to match what
you are expected to see in the real merge, instead of the diff against mainline,
but now I only do that in case we have to do a backmerge for some reason
(most of the time we can avoid those, I think this time one of the pull requests
had a backmerge of 4.12-rc1..4.12-rc2).

Let me know if you would rather have us handle this differently.

      Arnd

  reply	other threads:[~2017-07-05 12:31 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-04 14:24 [GIT PULL 5/7] ARM: SoC driver updates 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 [this message]
2017-07-05 12:31     ` Arnd Bergmann
  -- strict thread matches above, loose matches on Subject: below --
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
2015-02-17  8:33 [GIT PULL 0/7] ARM: SoC changes for 3.20 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
2015-02-17 17:57       ` Olof Johansson

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=CAK8P3a0FhDgP8foc2EEmgA3g69SSXgPaZmt3bCW538gWKwWrBw@mail.gmail.com \
    --to=arnd@arndb.de \
    --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.