Merge branch 'v4.4-rt' of https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux... ti-rt-linux-4.4.y
author | Dan Murphy <dmurphy@ti.com> | |
Fri, 27 Jul 2018 16:28:08 +0000 (11:28 -0500) | ||
committer | Dan Murphy <dmurphy@ti.com> | |
Fri, 27 Jul 2018 16:28:08 +0000 (11:28 -0500) | ||
commit | 2fe252bebd6449b8735cd20767ad1676c522178f | |
tree | 9e21a3b2c2a14a2a277c725c7781f076fb05773b | tree | snapshot (tar.xz tar.gz zip) |
parent | 554c3089096004c117b5e426773202453ec38c6b | commit | diff |
parent | eb6a34cce5c8974cd16601466c63840bbe04a37b | commit | diff |
Merge branch 'v4.4-rt' of https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt into ti-rt-linux-4.4.y
TI-Feature: linux_rt-4-4
TI-Tree: https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git
TI-Branch: v4.4-rt
* 'v4.4-rt' of https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt: (2277 commits)
Linux 4.4.144-rt161
Linux 4.4.143-rt160
Linux 4.4.142-rt159
Linux 4.4.141-rt158
Linux 4.4.140-rt157
Linux 4.4.139-rt156
Linux 4.4.144
ubi: fastmap: Erase outdated anchor PEBs during attach
ubi: Fix Fastmap's update_vol()
ubi: Fix races around ubi_refill_pools()
ubi: Be more paranoid while seaching for the most recent Fastmap
ubi: Rework Fastmap attach base code
ubi: Introduce vol_ignored()
clk: tegra: Fix PLL_U post divider and initial rate on Tegra30
block: do not use interruptible wait anywhere
x86/cpu: Re-apply forced caps every time CPU caps are re-read
x86/xen: Add call of speculative_store_bypass_ht_init() to PV paths
x86/bugs: Rename SSBD_NO to SSB_NO
x86/speculation, KVM: Implement support for VIRT_SPEC_CTRL/LS_CFG
x86/bugs: Rework spec_ctrl base and mask logic
...
Signed-off-by: Dan Murphy <dmurphy@ti.com>
# Conflicts:
# arch/arm/boot/dts/am57xx-beagle-x15.dts
# arch/arm/mach-omap2/pm.h
# drivers/mfd/palmas.c
# drivers/pci/controller/pci-keystone.c
# drivers/pci/controller/pci-layerscape.c
TI-Feature: linux_rt-4-4
TI-Tree: https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git
TI-Branch: v4.4-rt
* 'v4.4-rt' of https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt: (2277 commits)
Linux 4.4.144-rt161
Linux 4.4.143-rt160
Linux 4.4.142-rt159
Linux 4.4.141-rt158
Linux 4.4.140-rt157
Linux 4.4.139-rt156
Linux 4.4.144
ubi: fastmap: Erase outdated anchor PEBs during attach
ubi: Fix Fastmap's update_vol()
ubi: Fix races around ubi_refill_pools()
ubi: Be more paranoid while seaching for the most recent Fastmap
ubi: Rework Fastmap attach base code
ubi: Introduce vol_ignored()
clk: tegra: Fix PLL_U post divider and initial rate on Tegra30
block: do not use interruptible wait anywhere
x86/cpu: Re-apply forced caps every time CPU caps are re-read
x86/xen: Add call of speculative_store_bypass_ht_init() to PV paths
x86/bugs: Rename SSBD_NO to SSB_NO
x86/speculation, KVM: Implement support for VIRT_SPEC_CTRL/LS_CFG
x86/bugs: Rework spec_ctrl base and mask logic
...
Signed-off-by: Dan Murphy <dmurphy@ti.com>
# Conflicts:
# arch/arm/boot/dts/am57xx-beagle-x15.dts
# arch/arm/mach-omap2/pm.h
# drivers/mfd/palmas.c
# drivers/pci/controller/pci-keystone.c
# drivers/pci/controller/pci-layerscape.c
56 files changed: