From: balbi@ti.com (Felipe Balbi)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 2/6] ARM: SoC cleanups for v4.4
Date: Tue, 10 Nov 2015 16:58:09 -0600 [thread overview]
Message-ID: <87y4e5sbr2.fsf@saruman.tx.rr.com> (raw)
In-Reply-To: <CA+55aFzUHRvx-=ioeqT-QK+Od6yGixL3q5jit6kD6-Yf5WKXJA@mail.gmail.com>
Hi,
Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Mon, Nov 9, 2015 at 7:33 PM, Olof Johansson <olof@lixom.net> wrote:
>>
>> Conflicts:
>>
>> OMAP timer code has a treewide fix vs code deletion conflict. Delete
>> the code in HEAD, go with contents from branch.
>
> That doesn't look right. It also needs the clocksource_of_init ->
> clocksource_probe changes. The code was moved around rather than
> deleted.
correct. Moved from arch/arm/mach-omap2/ to drivers/clocksource/. We're
trying to get all our timer code to drivers/clocksource and make it
DT-only (when all other platforms switch away from legacy boot).
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151110/d7212538/attachment.sig>
WARNING: multiple messages have this Message-ID (diff)
From: Felipe Balbi <balbi@ti.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Olof Johansson <olof@lixom.net>
Cc: ARM SoC <arm@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4
Date: Tue, 10 Nov 2015 16:58:09 -0600 [thread overview]
Message-ID: <87y4e5sbr2.fsf@saruman.tx.rr.com> (raw)
In-Reply-To: <CA+55aFzUHRvx-=ioeqT-QK+Od6yGixL3q5jit6kD6-Yf5WKXJA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 663 bytes --]
Hi,
Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Mon, Nov 9, 2015 at 7:33 PM, Olof Johansson <olof@lixom.net> wrote:
>>
>> Conflicts:
>>
>> OMAP timer code has a treewide fix vs code deletion conflict. Delete
>> the code in HEAD, go with contents from branch.
>
> That doesn't look right. It also needs the clocksource_of_init ->
> clocksource_probe changes. The code was moved around rather than
> deleted.
correct. Moved from arch/arm/mach-omap2/ to drivers/clocksource/. We're
trying to get all our timer code to drivers/clocksource and make it
DT-only (when all other platforms switch away from legacy boot).
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
next prev parent reply other threads:[~2015-11-10 22:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-10 3:33 [GIT PULL 0/6] ARM: SoC branches for v4.4 Olof Johansson
2015-11-10 3:33 ` Olof Johansson
2015-11-10 3:33 ` [GIT PULL 1/6] ARM: SoC non-urgent fixes " Olof Johansson
2015-11-10 3:33 ` Olof Johansson
2015-11-10 3:33 ` [GIT PULL 2/6] ARM: SoC cleanups " Olof Johansson
2015-11-10 3:33 ` Olof Johansson
2015-11-10 22:52 ` Linus Torvalds
2015-11-10 22:52 ` Linus Torvalds
2015-11-10 22:58 ` Felipe Balbi [this message]
2015-11-10 22:58 ` Felipe Balbi
2015-11-10 23:23 ` Olof Johansson
2015-11-10 23:23 ` Olof Johansson
2015-11-10 3:33 ` [GIT PULL 3/6] ARM: SoC platform updates " Olof Johansson
2015-11-10 3:33 ` Olof Johansson
2015-11-10 3:33 ` [GIT PULL 4/6] ARM: SoC driver " Olof Johansson
2015-11-10 3:33 ` Olof Johansson
2015-11-10 3:33 ` [GIT PULL 5/6] ARM: DT " Olof Johansson
2015-11-10 3:33 ` Olof Johansson
2015-11-10 3:33 ` [GIT PULL 6/6] ARM: SoC defconfig " Olof Johansson
2015-11-10 3:33 ` Olof Johansson
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=87y4e5sbr2.fsf@saruman.tx.rr.com \
--to=balbi@ti.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.