Re: [GIT PULL 5/7] ARM: SoC driver updates

From	Arnd Bergmann <arnd@arndb.de>
Newsgroups	linux.kernel
Subject	Re: [GIT PULL 5/7] ARM: SoC driver updates
Date	2017-07-05 14:40 +0200
Message-ID	<tZRL3-6dL-5@gated-at.bofh.it> (permalink)
References	<tZwZZ-UF-23@gated-at.bofh.it> <tZE1r-5CH-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[GIT PULL 5/7] ARM: SoC driver updates Arnd Bergmann <arnd@arndb.de> - 2017-07-04 16:30 +0200
  Re: [GIT PULL 5/7] ARM: SoC driver updates Linus Torvalds <torvalds@linux-foundation.org> - 2017-07-05 00:00 +0200
    Re: [GIT PULL 5/7] ARM: SoC driver updates Arnd Bergmann <arnd@arndb.de> - 2017-07-05 14:40 +0200

csiph-web