From: sbranden@broadcom•com (Scott Branden)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL 3.19] Broadcom Cygnus SoC Device Tree changes
Date: Thu, 20 Nov 2014 12:55:35 -0800 [thread overview]
Message-ID: <546E5547.2070302@broadcom.com> (raw)
In-Reply-To: <201411201254.48494.arnd@arndb.de>
On 14-11-20 03:54 AM, Arnd Bergmann wrote:
> On Wednesday 12 November 2014, Florian Fainelli wrote:
>> The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:
>>
>> Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)
>>
>> are available in the git repository at:
>>
>> http://github.com/brcm/linux.git tags/arm-soc/for-3.19/cygnus-dts-v2
>>
>> for you to fetch changes up to c9ad7bc5fe3c57c8c817fcb1bd264a02176a40c4:
>>
>> ARM: dts: Enable Broadcom Cygnus SoC (2014-11-11 22:30:42 -0800)
>>
>> ----------------------------------------------------------------
>> This pull request contains the Broadcom Cygnus Device Tree changes:
>>
>> - binding documentation for the SoC and clock
>> - cygnus SoC and clock dtsi files
>> - DTS for Cygnus Entreprise phone, BCM911360K and BCM958300K
>
> Something went wrong here: This branch contains the updated license
> statements, but Olof had already merged the branch with the original
> license statements that we didn't like, so all three patches conflict
> with the ones we already have.
Hi Arnd,
It seems like the devicetree/bindings patch from this tag was not merged
in to next/dt ?
>
> I've done an merge of the new branch over the old one, which was
> literally the first thing in the next/dt branch. This isn't ideal,
> but I think it's the best way out of the mess.
>
> I hope we can avoid this in the future.
>
> Arnd
>
next prev parent reply other threads:[~2014-11-20 20:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-12 21:04 [GIT PULL 3.19] Broadcom Cygnus SoC defconfig Florian Fainelli
2014-11-12 21:04 ` [GIT PULL 3.19] Broadcom Cygnus SoC Device Tree changes Florian Fainelli
2014-11-20 11:54 ` Arnd Bergmann
2014-11-20 20:55 ` Scott Branden [this message]
2014-11-21 11:55 ` Arnd Bergmann
2014-11-21 16:11 ` Scott Branden
2014-11-12 21:04 ` [GIT PULL 3.19] Broadcom Cygnus SoC MAINTAINERS updates Florian Fainelli
2014-11-20 12:05 ` Arnd Bergmann
2014-11-12 21:04 ` [GIT PULL 3.19] Broadcom Cygnus SoC platform support Florian Fainelli
2014-11-20 12:11 ` Arnd Bergmann
2014-11-20 12:12 ` [GIT PULL 3.19] Broadcom Cygnus SoC defconfig Arnd Bergmann
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=546E5547.2070302@broadcom.com \
--to=sbranden@broadcom$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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