From: xuwei5@hisilicon.com (Wei Xu)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL v2]Hisilicon hip01 soc and development board updates for 3.20
Date: Tue, 20 Jan 2015 13:39:38 +0800 [thread overview]
Message-ID: <54BDEA1A.3060502@hisilicon.com> (raw)
In-Reply-To: <20150119191941.GE16883@quad.lixom.net>
On 2015/1/20 3:19, Olof Johansson wrote:
> On Thu, Jan 15, 2015 at 10:19:23AM +0800, Wei Xu wrote:
>> Hi Arnd, Hi Olof, Hi Kevin,
>>
>> Could you please help to merge the pull request of hisilicon hip01 soc for 3.20.
>> Thanks!
>>
>> Best Regards,
>> Wei
>>
>> The following changes since commit 97bf6af1f928216fd6c5a66e8a57bfa95a659672:
>>
>> Linux 3.19-rc1 (2014-12-20 17:08:50 -0800)
>>
>> are available in the git repository at:
>>
>> git://github.com/hisilicon/linux-hisi.git tags/hip01-for-3.20-v2
>>
>> for you to fetch changes up to 27040189cb050cbe52a81c0e6aeb552872aa0736:
>>
>> ARM: hisi: enable smp for HiP01 (2015-01-15 09:59:51 +0800)
>>
>> ----------------------------------------------------------------
>> ARM: mach-hisi: Hisilicon hip01 soc and development board updates for 3.20
>>
>> - Add hip01 debug UART
>> - Add hip01 DT_MACHINE and ARCH_HIP01 configure item
>> - Add dts for Hisilicon hip01-ca9x2 board
>> - Enable ARCH_HIP01 in the hisi_defconfig
>> - Rename hix5hd2_smp_prepare_cpus to hisi_common_smp_prepare_cpus
>> - Rename hix5hd2_secondary_startup to hisi_secondary_startup
>> - Enable smp for hip01
Hi Olof,
> Actually, you're adding a new dts file that's conflicting at the top level now,
> and we don't want that.
>
> Please split your branches like other maintainers do into soc and dt branches.
>
> dt
> soc
> defconfig
Thanks for your patient education!
I will follow it next time.
> I don't know your workflow, if you have users of your branches. If not, and if
> your tree isn't in linux-next, I can cherry pick the branch apart as needed
> here. Just let me know.
My tree is not in linux-next. I have checked the linux-next.git/tree/Next/Trees.
Could you please help to cherry pick them this time?
Thanks!
Best Regards,
Wei
>
> Thanks.
>
> -Olof
>
> .
>
next prev parent reply other threads:[~2015-01-20 5:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-15 2:19 [GIT PULL v2]Hisilicon hip01 soc and development board updates for 3.20 Wei Xu
2015-01-19 19:17 ` Olof Johansson
2015-01-19 19:19 ` Olof Johansson
2015-01-20 5:39 ` Wei Xu [this message]
2015-01-21 22:36 ` Olof Johansson
2015-01-22 0:31 ` Wei Xu
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=54BDEA1A.3060502@hisilicon.com \
--to=xuwei5@hisilicon.com \
--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.