From: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> To: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> Cc: arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: Re: [GIT PULL] ARM: tegra: dt2 branch Date: Mon, 14 May 2012 13:04:13 -0600 [thread overview] Message-ID: <4FB1572D.90500@wwwdotorg.org> (raw) In-Reply-To: <201205141854.34331.arnd-r2nGTMty4D4@public.gmane.org> On 05/14/2012 12:54 PM, Arnd Bergmann wrote: > On Monday 14 May 2012, Stephen Warren wrote: >> This is some late device tree additions and cleanup for Tegra. > > Hi Stephen, > > The log you sent there does not match what I got. These are the changes I got > from pulling your tree: > > ARM: dt: tegra: invert status=disable vs status=okay > ARM: dt: tegra: consistent basic property ordering > ARM: dt: tegra: sort nodes based on bus order > ARM: dt: tegra: remove duplicate device_type property > ARM: dt: tegra: consistenly use lower-case for hex constants > ARM: dt: tegra: format regs properties consistently > ARM: dt: tegra: gpio comment cleanup > ARM: dt: tegra: remove unnecessary unit addresses > ARM: dt: tegra: whitespace cleanup > ARM: dt: tegra cardhu: fix typo in SDHCI node name > ARM: dt: tegra: cardhu: register core regulator tps62361 > ARM: dt: tegra30.dtsi: Add SMMU node > ARM: dt: tegra20.dtsi: Add GART node > ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes > ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes > ARM: dt: tegra: Add device tree support for AHB Those look good. I assume the problem is in the diffstat not the log... > arch/arm/boot/dts/tegra-cardhu.dts | 77 +++++++----------- > arch/arm/boot/dts/tegra-harmony.dts | 100 +++++++++++------------ > arch/arm/boot/dts/tegra-paz00.dts | 112 ++++++++++++------------- > arch/arm/boot/dts/tegra-seaboard.dts | 176 +++++++++++++++++++--------------------- > arch/arm/boot/dts/tegra-trimslice.dts | 71 +++++++--------- > arch/arm/boot/dts/tegra-ventana.dts | 90 ++++++++++----------- > arch/arm/boot/dts/tegra20.dtsi | 275 +++++++++++++++++++++++++++++++++++--------------------------- > arch/arm/boot/dts/tegra30.dtsi | 292 ++++++++++++++++++++++++++++++++++++++---------------------------- > 8 files changed, 605 insertions(+), 588 deletions(-) > > I can't see anything wrong with your commits but please check again that it all makes > sense and let me know if I should really pull this version. I think that looks OK. I probably just generated the diffstat backwards. I ran: git diff -M --stat=75 --summary $TIP_SHA..$BASE_SHA Perhaps I should have run: git diff -M --stat=75 --summary $BASE_SHA..$TIP_SHA where BASE_SHA is the merge the branch was based on, and TIP_SHA is the latest commit in the branch.
WARNING: multiple messages have this Message-ID (diff)
From: swarren@wwwdotorg.org (Stephen Warren) To: linux-arm-kernel@lists.infradead.org Subject: [GIT PULL] ARM: tegra: dt2 branch Date: Mon, 14 May 2012 13:04:13 -0600 [thread overview] Message-ID: <4FB1572D.90500@wwwdotorg.org> (raw) In-Reply-To: <201205141854.34331.arnd@arndb.de> On 05/14/2012 12:54 PM, Arnd Bergmann wrote: > On Monday 14 May 2012, Stephen Warren wrote: >> This is some late device tree additions and cleanup for Tegra. > > Hi Stephen, > > The log you sent there does not match what I got. These are the changes I got > from pulling your tree: > > ARM: dt: tegra: invert status=disable vs status=okay > ARM: dt: tegra: consistent basic property ordering > ARM: dt: tegra: sort nodes based on bus order > ARM: dt: tegra: remove duplicate device_type property > ARM: dt: tegra: consistenly use lower-case for hex constants > ARM: dt: tegra: format regs properties consistently > ARM: dt: tegra: gpio comment cleanup > ARM: dt: tegra: remove unnecessary unit addresses > ARM: dt: tegra: whitespace cleanup > ARM: dt: tegra cardhu: fix typo in SDHCI node name > ARM: dt: tegra: cardhu: register core regulator tps62361 > ARM: dt: tegra30.dtsi: Add SMMU node > ARM: dt: tegra20.dtsi: Add GART node > ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes > ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes > ARM: dt: tegra: Add device tree support for AHB Those look good. I assume the problem is in the diffstat not the log... > arch/arm/boot/dts/tegra-cardhu.dts | 77 +++++++----------- > arch/arm/boot/dts/tegra-harmony.dts | 100 +++++++++++------------ > arch/arm/boot/dts/tegra-paz00.dts | 112 ++++++++++++------------- > arch/arm/boot/dts/tegra-seaboard.dts | 176 +++++++++++++++++++--------------------- > arch/arm/boot/dts/tegra-trimslice.dts | 71 +++++++--------- > arch/arm/boot/dts/tegra-ventana.dts | 90 ++++++++++----------- > arch/arm/boot/dts/tegra20.dtsi | 275 +++++++++++++++++++++++++++++++++++--------------------------- > arch/arm/boot/dts/tegra30.dtsi | 292 ++++++++++++++++++++++++++++++++++++++---------------------------- > 8 files changed, 605 insertions(+), 588 deletions(-) > > I can't see anything wrong with your commits but please check again that it all makes > sense and let me know if I should really pull this version. I think that looks OK. I probably just generated the diffstat backwards. I ran: git diff -M --stat=75 --summary $TIP_SHA..$BASE_SHA Perhaps I should have run: git diff -M --stat=75 --summary $BASE_SHA..$TIP_SHA where BASE_SHA is the merge the branch was based on, and TIP_SHA is the latest commit in the branch.
next prev parent reply other threads:[~2012-05-14 19:04 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-05-14 17:20 [GIT PULL] ARM: tegra: dt2 branch Stephen Warren 2012-05-14 17:20 ` Stephen Warren [not found] ` <1337016017-30537-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-05-14 17:20 ` [GIT PULL] ARM: tegra: defconfig2 branch Stephen Warren [not found] ` <1337016017-30537-2-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-05-14 18:56 ` Arnd Bergmann 2012-05-14 18:56 ` Arnd Bergmann 2012-05-14 18:54 ` [GIT PULL] ARM: tegra: dt2 branch Arnd Bergmann 2012-05-14 18:54 ` Arnd Bergmann [not found] ` <201205141854.34331.arnd-r2nGTMty4D4@public.gmane.org> 2012-05-14 19:04 ` Stephen Warren [this message] 2012-05-14 19:04 ` Stephen Warren [not found] ` <4FB1572D.90500-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-05-14 20:37 ` Arnd Bergmann 2012-05-14 20:37 ` Arnd Bergmann [not found] ` <201205142037.08752.arnd-r2nGTMty4D4@public.gmane.org> 2012-05-14 20:54 ` Stephen Warren 2012-05-14 20:54 ` Stephen Warren [not found] ` <4FB170F3.8080107-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-05-15 11:43 ` Arnd Bergmann 2012-05-15 11:43 ` Arnd Bergmann [not found] ` <201205151143.26008.arnd-r2nGTMty4D4@public.gmane.org> 2012-05-15 16:15 ` Stephen Warren 2012-05-15 16:15 ` Stephen Warren [not found] ` <4FB2812F.1010500-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-05-15 19:15 ` Arnd Bergmann 2012-05-15 19:15 ` Arnd Bergmann [not found] ` <201205151915.25543.arnd-r2nGTMty4D4@public.gmane.org> 2012-05-15 19:24 ` Stephen Warren 2012-05-15 19:24 ` Stephen Warren
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=4FB1572D.90500@wwwdotorg.org \ --to=swarren-3lzwwm7+weoh9zmkesr00q@public.gmane.org \ --cc=arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=arnd-r2nGTMty4D4@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.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: linkBe 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.