Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1266838
| From | Linus Torvalds <torvalds@linux-foundation.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 |
| Date | 2015-11-11 00:00 +0100 |
| Message-ID | <qtq3o-2NW-9@gated-at.bofh.it> (permalink) |
| References | <qt7WN-84G-1@gated-at.bofh.it> <qt7WO-84G-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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.
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[GIT PULL 0/6] ARM: SoC branches for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
[GIT PULL 2/6] ARM: SoC cleanups for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 Linus Torvalds <torvalds@linux-foundation.org> - 2015-11-11 00:00 +0100
Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 Felipe Balbi <balbi@ti.com> - 2015-11-11 00:00 +0100
Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-11 00:30 +0100
[GIT PULL 4/6] ARM: SoC driver updates for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
[GIT PULL 3/6] ARM: SoC platform updates for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
[GIT PULL 1/6] ARM: SoC non-urgent fixes for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
[GIT PULL 6/6] ARM: SoC defconfig updates for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
csiph-web