Please don't merge my work/* branches, they are where I gather a varied pile of Stuff™ to test a kernel and they were not designed with merging in mind. Instead, merge or rebase the relevant patch/* branches.
The main patch series is:
master # (baseline for patches)
patch/tiler-memtype # fix memtype for tiler memory
patch/tiler-fast # all tiler performance fixes combined
patch/tiler-buf-fbdev # force legacy fbdev into tiler memory
patch/tiler-fbdev # add hacky rotation mechanism via kernel parameter
Merging patch/tiler-fbdev suffices since this implicitly includes the earlier patches.
Some independent patches of interest that should be safe to merge are:
patch/omap-l3 # make the mostly-useless l3 intercon driver optional
patch/fast-nc-read # tiler-unrelated speedup for omap5/dra7
patch/of-alias # some fixes for unreliable device numbering
Don't merge patch/tiler-buf-dumb: it forces "dumb buffers" to be allocated in tiler memory, but this is rude and unnecessary, and it breaks SGX.