All of lore.kernel.org
 help / color / mirror / Atom feed
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 3/8] ARM: tegra: cleanup
Date: Tue, 09 Apr 2013 09:36:45 -0600	[thread overview]
Message-ID: <5164358D.1050204@wwwdotorg.org> (raw)
In-Reply-To: <201304091544.32377.arnd-r2nGTMty4D4@public.gmane.org>

On 04/09/2013 07:44 AM, Arnd Bergmann wrote:
> On Friday 05 April 2013, Stephen Warren wrote:
>> This branch includes various cleanup of the core Tegra support.
>>
>> * Unification of the separate board-dt-tegra*.c files into a single
>>   tegra.c, now that everything is DT-driven and basically identical.
>> * Use of_clk_get() in the Tegra clocksource driver so that clocks are
>>   described in DT rather than hard-coding clock names.
>> * Some cleanup of the PMC-related code, with the aim that the PMC
>>   "driver" contains more of the code that touches PMC registers, rather
>>   than spreading PMC register accesses through other files.
>> * Conversion of the "PMC" driver to acquire resources describe in device
>>   tree rather than hard-coding them.
>> * Use of common code for the CPU sleep TLB invalidation.
>>
> 
> Pulled into next/cleanup branch and resolved the conflict against
> an earlier cleanup that was already present there, fixup below.

Oh yes, sorry I forgot to mention that; of course this conflict doesn't
show up when I build my own for-next, but rather only in
arm-soc/linux-next so I forgot about it:-(

Anyway, the resolution you posted looks good. Thanks.

WARNING: multiple messages have this Message-ID (diff)
From: swarren@wwwdotorg.org (Stephen Warren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 3/8] ARM: tegra: cleanup
Date: Tue, 09 Apr 2013 09:36:45 -0600	[thread overview]
Message-ID: <5164358D.1050204@wwwdotorg.org> (raw)
In-Reply-To: <201304091544.32377.arnd@arndb.de>

On 04/09/2013 07:44 AM, Arnd Bergmann wrote:
> On Friday 05 April 2013, Stephen Warren wrote:
>> This branch includes various cleanup of the core Tegra support.
>>
>> * Unification of the separate board-dt-tegra*.c files into a single
>>   tegra.c, now that everything is DT-driven and basically identical.
>> * Use of_clk_get() in the Tegra clocksource driver so that clocks are
>>   described in DT rather than hard-coding clock names.
>> * Some cleanup of the PMC-related code, with the aim that the PMC
>>   "driver" contains more of the code that touches PMC registers, rather
>>   than spreading PMC register accesses through other files.
>> * Conversion of the "PMC" driver to acquire resources describe in device
>>   tree rather than hard-coding them.
>> * Use of common code for the CPU sleep TLB invalidation.
>>
> 
> Pulled into next/cleanup branch and resolved the conflict against
> an earlier cleanup that was already present there, fixup below.

Oh yes, sorry I forgot to mention that; of course this conflict doesn't
show up when I build my own for-next, but rather only in
arm-soc/linux-next so I forgot about it:-(

Anyway, the resolution you posted looks good. Thanks.

  parent reply	other threads:[~2013-04-09 15:36 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-05 17:03 [GIT PULL 1/8] ARM: tegra: DT-related fixes needed by the MMC tree Stephen Warren
2013-04-05 17:03 ` Stephen Warren
2013-04-05 17:03 ` [GIT PULL 2/8] ARM: tegra: minor fixes Stephen Warren
2013-04-05 17:03   ` Stephen Warren
     [not found]   ` <1365181426-11547-2-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-04-09 13:13     ` Arnd Bergmann
2013-04-09 13:13       ` Arnd Bergmann
2013-04-05 17:03 ` [GIT PULL 3/8] ARM: tegra: cleanup Stephen Warren
2013-04-05 17:03   ` Stephen Warren
     [not found]   ` <1365181426-11547-3-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-04-09 13:44     ` Arnd Bergmann
2013-04-09 13:44       ` Arnd Bergmann
     [not found]       ` <201304091544.32377.arnd-r2nGTMty4D4@public.gmane.org>
2013-04-09 15:36         ` Stephen Warren [this message]
2013-04-09 15:36           ` Stephen Warren
2013-04-05 17:03 ` [GIT PULL 4/8] ARM: tegra: core SoC support development Stephen Warren
2013-04-05 17:03   ` Stephen Warren
     [not found]   ` <1365181426-11547-4-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-04-09 14:37     ` Arnd Bergmann
2013-04-09 14:37       ` Arnd Bergmann
2013-04-05 17:03 ` [GIT PULL 5/8] ARM: tegra: clock driver development Stephen Warren
2013-04-05 17:03   ` Stephen Warren
     [not found]   ` <1365181426-11547-5-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-04-09 15:14     ` Arnd Bergmann
2013-04-09 15:14       ` Arnd Bergmann
     [not found]       ` <201304091714.53220.arnd-r2nGTMty4D4@public.gmane.org>
2013-04-09 15:38         ` Stephen Warren
2013-04-09 15:38           ` Stephen Warren
2013-04-05 17:03 ` [GIT PULL 6/8] ARM: tegra: device tree changes Stephen Warren
2013-04-05 17:03   ` Stephen Warren
     [not found]   ` <1365181426-11547-6-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-04-09 15:04     ` Arnd Bergmann
2013-04-09 15:04       ` Arnd Bergmann
2013-04-09 15:55   ` Arnd Bergmann
2013-04-09 15:55     ` Arnd Bergmann
2013-04-05 17:03 ` [GIT PULL 7/8] ARM: tegra: multi-platform conversion Stephen Warren
2013-04-05 17:03   ` Stephen Warren
     [not found]   ` <1365181426-11547-7-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-04-09 14:59     ` Arnd Bergmann
2013-04-09 14:59       ` Arnd Bergmann
     [not found]       ` <201304091659.08376.arnd-r2nGTMty4D4@public.gmane.org>
2013-04-09 20:01         ` Arnd Bergmann
2013-04-09 20:01           ` Arnd Bergmann
2013-04-09 21:49           ` Stephen Warren
2013-04-09 21:49             ` Stephen Warren
2013-04-05 17:03 ` [GIT PULL 8/8] ARM: tegra: defconfig changes Stephen Warren
2013-04-05 17:03   ` Stephen Warren
     [not found]   ` <1365181426-11547-8-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-04-09 15:16     ` Arnd Bergmann
2013-04-09 15:16       ` Arnd Bergmann
     [not found]       ` <201304091716.36058.arnd-r2nGTMty4D4@public.gmane.org>
2013-04-11 17:53         ` Olof Johansson
2013-04-11 17:53           ` Olof Johansson
     [not found] ` <1365181426-11547-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-04-09 11:01   ` [GIT PULL 1/8] ARM: tegra: DT-related fixes needed by the MMC tree Arnd Bergmann
2013-04-09 11:01     ` 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=5164358D.1050204@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: 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.