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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAK8P3a0FhDgP8foc2EEmgA3g69SSXgPaZmt3bCW538gWKwWrBw@mail.gmail.com>
Date:   Wed, 5 Jul 2017 14:31:38 +0200
From:   Arnd Bergmann <arnd@...db.de>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     arm-soc <arm@...nel.org>,
        Linux ARM <linux-arm-kernel@...ts.infradead.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL 5/7] ARM: SoC driver updates

On Tue, Jul 4, 2017 at 11:53 PM, Linus Torvalds
<torvalds@...ux-foundation.org> wrote:
> On Tue, Jul 4, 2017 at 7:24 AM, Arnd Bergmann <arnd@...db.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