From: f.fainelli@gmail•com (Florian Fainelli)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL 1/2] Broadcom Device Tree changes for 4.4 (part 2)
Date: Fri, 23 Oct 2015 12:32:02 -0700 [thread overview]
Message-ID: <562A8B32.5040906@gmail.com> (raw)
In-Reply-To: <20151023182652.GE18961@localhost>
On 23/10/15 11:26, Olof Johansson wrote:
> Hi Florian,
>
> On Mon, Oct 19, 2015 at 11:43:10AM -0700, Florian Fainelli wrote:
>> The following changes since commit eef228e3191de0b62ef5913be216f25ba6b23a4c:
>>
>> ARM: dts: move aliases back to .dts in Cygnus (2015-09-24 18:30:10 -0700)
>>
>> are available in the git repository at:
>>
>> http://github.com/Broadcom/stblinux tags/arm-soc/for-4.4/devicetree-part2
>>
>> for you to fetch changes up to da6b53a6f7abc3d84260a9f0ff9849a88b44e11f:
>>
>> ARM: bcm2835: Switch to using the new clock driver support. (2015-10-19 11:32:24 -0700)
>>
>> ----------------------------------------------------------------
>> This pull request contains the DT changes for BCM2835 in 4.4. It
>> pulls in clk/clk-bcm2835 (which Stephen Boyd has said would be stable)
>> because the DT changes to enable the clock driver need the driver
>> itself to be present. These changes include the following:
>>
>> - Eric Anholt, moves the bcm2835 clock driver under bcm/ where it belongs with
>> other Broadcom clock providers drivers, defines the binding for new clock
>> driver, adds support for programming the BCM2835 audio domain, adds the DDC I2C
>> controller to Device Tree, and finally migrates the Device Tree to use the new
>> clock driver binding
>>
>> - Lubomir Rintel adds support for the Raspberry Pi Model A+ and B revision 2, and
>> remove the I2S controller which is non-existent on Raspberry Pi Model B
>>
>> - Stefan Wahren adds an uart0 label for referencing the UART adapter
>>
>> ----------------------------------------------------------------
>> Eric Anholt (5):
>> ARM: bcm2835: Add the DDC I2C controller to the device tree.
>> clk: bcm2835: Move under bcm/ with other Broadcom SoC clk drivers.
>
> I see this patch in the branch, and it's signed off both by Stephen and you,
> which makes me suspect you cherry-picked it over from their tree?
>
> That means it'll exist in two copies and might cause pretty nasty conflicts at
> merge time if other changes have gone in on top of the separate commits.
> Instead, we ask that you share a branch with the same exact commits, since git
> will handle that appropriately and the patch will only be in the tree once.
Just to clarify, are you okay with me merging a branch from Eric's tree,
or do you want to see individual commits, except for those that appear
in Stephen's tree (the clock changes basically)?
--
Florian
next prev parent reply other threads:[~2015-10-23 19:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-19 18:43 [GIT PULL 2/2] Broadcom SoC changes for v4.4 (part 2) Florian Fainelli
2015-10-19 18:43 ` [GIT PULL 1/2] Broadcom Device Tree changes for 4.4 " Florian Fainelli
2015-10-23 18:26 ` Olof Johansson
2015-10-23 19:32 ` Florian Fainelli [this message]
2015-10-23 19:42 ` Olof Johansson
2015-10-23 18:02 ` [GIT PULL 2/2] Broadcom SoC changes for v4.4 " Olof Johansson
2015-10-23 18:45 ` Florian Fainelli
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=562A8B32.5040906@gmail.com \
--to=f.fainelli@gmail$(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