[GIT,PULL,0/5] ARM: Changes for 5.6 merge window

Message

Olof Johansson Feb. 8, 2020, 11:20 a.m. UTC

Hi Linus,

Here are our pull requests for this merge window. While I've generally
been bad at getting these in during the early merge window, this cycle
is unusually late due to travel and bad planning on my behalf.

Good news (and part of the reason why I didn't stress getting them in)
is that it's a relatively quiet cycle w.r.t. conflicts and overlapping
changes, only one driver had minor conflicts (described in 3/5 pull
request).

Most of the new machines/SoC added this cycle are described in the
Devicetree pull request (2/5). Some of the highlights are Amazon Echo
(gen1), Google Coral Edge TPU and SolidRun HoneyComb/ClearFog 16-core
ITX systems.


Please merge. Thanks!


-Olof

Comments

Olof Johansson Feb. 8, 2020, 9:25 p.m. UTC | #1

Hi Linus,

I completely botched the last generation of pull requests by
mis-generating them, and I also missed to push the tags to the server.

Here's the fresh set. Apologies for the noise, please merge.


For anyone keeping track at home, what happened at my end was:

We use a script to generate our pull requests, and it's ran against a tree
that is mainline + the merged branches. The flow is usually to merge in
a branch, note down any conflicts needing to be resolved, then generate
the pull request. Or, sometimes, I do all the merges and then generate the
last pull request, reset the tree to HEAD~, second-last pull request, etc.

I completely missed changing the tree between the generation this time,
so every pull request referenced the right tag, but the diffstat and
other contents was botched.

It's probably time to automate more of this with scripts at my end,
to avoid these manual mistakes.


-Olof