All of lore.kernel.org
 help / color / mirror / Atom feed
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 3.19] Broadcom Cygnus SoC Device Tree changes
Date: Fri, 21 Nov 2014 12:55:04 +0100	[thread overview]
Message-ID: <3132550.UOyhmffLBV@wuerfel> (raw)
In-Reply-To: <546E5547.2070302@broadcom.com>

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

WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
To: Scott Branden <sbranden-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>
Cc: Florian Fainelli
	<f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org,
	mporter-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
	bcm-xK7y4jjYLqYh9ZMKESR00Q@public.gmane.org,
	bcm-kernel-feedback-list-dY08KVG/lbpWk0Htik3J/w@public.gmane.org,
	jdzheng-dY08KVG/lbpWk0Htik3J/w@public.gmane.org,
	rjui-dY08KVG/lbpWk0Htik3J/w@public.gmane.org,
	jonathar-dY08KVG/lbpWk0Htik3J/w@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [GIT PULL 3.19] Broadcom Cygnus SoC Device Tree changes
Date: Fri, 21 Nov 2014 12:55:04 +0100	[thread overview]
Message-ID: <3132550.UOyhmffLBV@wuerfel> (raw)
In-Reply-To: <546E5547.2070302-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>

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-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  reply	other threads:[~2014-11-21 11:55 UTC|newest]

Thread overview: 22+ 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 ` Florian Fainelli
2014-11-12 21:04 ` [GIT PULL 3.19] Broadcom Cygnus SoC Device Tree changes Florian Fainelli
2014-11-12 21:04   ` Florian Fainelli
2014-11-20 11:54   ` Arnd Bergmann
2014-11-20 11:54     ` Arnd Bergmann
2014-11-20 20:55     ` Scott Branden
2014-11-20 20:55       ` Scott Branden
2014-11-21 11:55       ` Arnd Bergmann [this message]
2014-11-21 11:55         ` Arnd Bergmann
2014-11-21 16:11         ` Scott Branden
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-12 21:04   ` Florian Fainelli
2014-11-20 12:05   ` Arnd Bergmann
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-12 21:04   ` Florian Fainelli
2014-11-20 12:11   ` Arnd Bergmann
2014-11-20 12:11     ` Arnd Bergmann
2014-11-20 12:12 ` [GIT PULL 3.19] Broadcom Cygnus SoC defconfig Arnd Bergmann
2014-11-20 12:12   ` 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=3132550.UOyhmffLBV@wuerfel \
    --to=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.