linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Olof Johansson <olof@lixom.net>
To: Florian Fainelli <f.fainelli@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org, arm@kernel.org,
	arnd@arndb.de, Kevin Hilman <khilman@kernel.org>,
	Eric Anholt <eric@anholt.net>, Lukas Wunner <lukas@wunner.de>,
	bcm-kernel-feedback-list@broadcom.com,
	Stefan Wahren <wahrenst@gmx.net>,
	Martin Sperl <kernel@martin.sperl.org>,
	Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Subject: Re: [GIT PULL 1/6] Broadcom devicetree changes for 5.3
Date: Wed, 19 Jun 2019 06:35:38 -0700	[thread overview]
Message-ID: <20190619133538.64htegz3xepd2mu7@localhost> (raw)
In-Reply-To: <20190612025028.13118-1-f.fainelli@gmail.com>

On Tue, Jun 11, 2019 at 07:50:23PM -0700, Florian Fainelli wrote:
> The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:
> 
>   Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)
> 
> are available in the Git repository at:
> 
>   https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree
> 
> for you to fetch changes up to 34b1441452e550169b4d3647a4f851d9332d4b76:
> 
>   ARM: dts: BCM5301X: Fix most DTC W=1 warnings (2019-06-11 15:07:56 -0700)
> 
> ----------------------------------------------------------------
> This pull request contain Broadcom ARM-based SoCs Device Tree changes
> for 5.3 please pull the following:
> 
> - Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI
>   controller
> 
> - Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files
>   and provides a fix for devices failing to boot after the removal of
>   skelton.dtsi (that commit has been submitted as a separate fix)
> 
> ----------------------------------------------------------------
> Florian Fainelli (9):
>       Merge tag 'tags/bcm2835-dt-next-2019-06-01' into devicetree/next
>       ARM: dts: bcm: Add missing device_type = "memory" property
>       ARM: dts: Fix BCM7445 DTC warnings
>       ARM: dts: Cygnus: Fix most DTC W=1 warnings
>       ARM: dts: bcm-mobile: Fix most DTC W=1 warnings
>       ARM: dts: BCM53573: Fix DTC W=1 warnings
>       ARM: dts: BCM63xx: Fix DTC W=1 warnings
>       ARM: dts: NSP: Fix the bulk of W=1 DTC warnings
>       ARM: dts: BCM5301X: Fix most DTC W=1 warnings
> 
> Lukas Wunner (1):
>       ARM: bcm283x: Enable DMA support for SPI controller

Something went wrong here. I merged your pull request for the missing
device_type that had commit e8bd76dccd79 for that patch.

Here you have the same patch here as 0e9e8c404ec2. While git normally handles
this alright, in this case the warning removals changes the line above so you
get a merge conflict for every file and that's a lot to fix up.

Would you mind rebuilding this branch on top of your fixes to keep that patch
at the same commit?


Thanks,


-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-06-19 13:42 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-12  2:50 [GIT PULL 1/6] Broadcom devicetree changes for 5.3 Florian Fainelli
2019-06-12  2:50 ` [GIT PULL 2/6] Broadcom devicetree-arm64 " Florian Fainelli
2019-06-19 13:25   ` Olof Johansson
2019-06-12  2:50 ` [GIT PULL 3/6] Broadcom drivers " Florian Fainelli
2019-06-17 11:53   ` Olof Johansson
2019-06-12  2:50 ` [GIT PULL 4/6] Broadcom maintainers " Florian Fainelli
2019-06-19 16:10   ` Olof Johansson
2019-06-12  2:50 ` [GIT PULL 5/6] Broadcom soc " Florian Fainelli
2019-06-12  2:50 ` [GIT PULL 6/6] Broadcom soc-arm64 " Florian Fainelli
2019-06-17 12:16   ` Olof Johansson
2019-06-19 13:35 ` Olof Johansson [this message]
2019-06-23  2:22   ` [GIT PULL 1/6] Broadcom devicetree " Florian Fainelli
2019-06-25 11:17     ` Olof Johansson
2019-06-23  3:29 ` [GIT PULL 1/6 v2] Broadcom devicetree changes for 5.2 Florian Fainelli
2019-06-25 11:16   ` Olof Johansson
2019-06-25 12:56     ` 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=20190619133538.64htegz3xepd2mu7@localhost \
    --to=olof@lixom.net \
    --cc=arm@kernel.org \
    --cc=arnd@arndb.de \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=eric@anholt.net \
    --cc=f.fainelli@gmail.com \
    --cc=kernel@martin.sperl.org \
    --cc=khilman@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=lukas@wunner.de \
    --cc=nsaenzjulienne@suse.de \
    --cc=wahrenst@gmx.net \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).