| Message ID | 1415826266-6867-2-git-send-email-f.fainelli@gmail.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
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. 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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thursday 20 November 2014 12:55:35 Scott Branden wrote: > 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 definitely see them here, can you pull our tree again and have a second look? Do you see them in linux-next? Arnd -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 14-11-21 03:55 AM, Arnd Bergmann wrote: > On Thursday 20 November 2014 12:55:35 Scott Branden wrote: >> 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 definitely see them here, can you pull our tree again and have a second > look? Do you see them in linux-next? I see them now. Sorry, must have been doing something wrong yesterday. > > Arnd > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 ---------------------------------------------------------------- Jonathan Richardson (1): dt-bindings: Document Broadcom Cygnus SoC and clocks Scott Branden (1): ARM: dts: Enable Broadcom Cygnus SoC .../devicetree/bindings/arm/bcm/cygnus.txt | 31 +++++ .../devicetree/bindings/clock/bcm-cygnus-clock.txt | 34 +++++ arch/arm/boot/dts/Makefile | 3 + arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 91 ++++++++++++++ arch/arm/boot/dts/bcm-cygnus.dtsi | 140 +++++++++++++++++++++ arch/arm/boot/dts/bcm911360_entphn.dts | 53 ++++++++ arch/arm/boot/dts/bcm911360k.dts | 53 ++++++++ arch/arm/boot/dts/bcm958300k.dts | 53 ++++++++ 8 files changed, 458 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/bcm/cygnus.txt create mode 100644 Documentation/devicetree/bindings/clock/bcm-cygnus-clock.txt create mode 100644 arch/arm/boot/dts/bcm-cygnus-clock.dtsi create mode 100644 arch/arm/boot/dts/bcm-cygnus.dtsi create mode 100644 arch/arm/boot/dts/bcm911360_entphn.dts create mode 100644 arch/arm/boot/dts/bcm911360k.dts create mode 100644 arch/arm/boot/dts/bcm958300k.dts -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html