From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752560AbdGEMbl (ORCPT ); Wed, 5 Jul 2017 08:31:41 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:34144 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751743AbdGEMbj (ORCPT ); Wed, 5 Jul 2017 08:31:39 -0400 MIME-Version: 1.0 In-Reply-To: References: From: Arnd Bergmann Date: Wed, 5 Jul 2017 14:31:38 +0200 X-Google-Sender-Auth: 2ZtJgzRK2rpd79RDBmNMER2MDqo Message-ID: Subject: Re: [GIT PULL 5/7] ARM: SoC driver updates To: Linus Torvalds Cc: arm-soc , Linux ARM , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 4, 2017 at 11:53 PM, Linus Torvalds wrote: > On Tue, Jul 4, 2017 at 7:24 AM, Arnd Bergmann 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Wed, 5 Jul 2017 14:31:38 +0200 Subject: [GIT PULL 5/7] ARM: SoC driver updates In-Reply-To: References: Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Jul 4, 2017 at 11:53 PM, Linus Torvalds wrote: > On Tue, Jul 4, 2017 at 7:24 AM, Arnd Bergmann 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