aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-01-05Merge tag 'qcom-arm64-defconfig-for-4.16' of ↵Arnd Bergmann1-3/+0
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc Pull "Qualcomm ARM64 Based defconfig Updates for v4.16" from Andy Gross: * Remove legacy QCOM config options
2018-01-04Merge tag 'sunxi-config64-for-4.16' of ↵Olof Johansson1-0/+2
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/soc Allwinner arm64 defconfig changes for 4.16 Enables MUSB driver and the Allwinner glue layer driver by default. All Allwinner SoCs (excluding the A80) have the Mentor Graphics Inventra Multi-Point Hi-Speed OTG Controller (MHDRC). Enabling this extends test coverage to this peripheral. * tag 'sunxi-config64-for-4.16' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: defconfig: enable MUSB HDRC along with Allwinner glue Signed-off-by: Olof Johansson <[email protected]>
2018-01-04Merge tag 'keystone_config_for_4.16' of ↵Olof Johansson1-0/+7
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc ARM: Keystone configs for 4.16 - Enable QSPI - Enable LEDs - Enable GPIO-decoder * tag 'keystone_config_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: configs: keystone_defconfig: Enable few peripheral drivers Signed-off-by: Olof Johansson <[email protected]>
2018-01-04Merge tag 'pxa-for-4.16' of https://github.com/rjarzmik/linux into next/socOlof Johansson41-144/+100
This is the pxa changes for v4.16 cycle. It is : - the conversion to the new parser sharpslpart parser for the Sharp variants - an I2C platform data cleanup for PXA - a gpioreg switch of one register for lubbock * tag 'pxa-for-4.16' of https://github.com/rjarzmik/linux: ARM: pxa/lubbock: add GPIO driver for LUB_MISC_WR register ARM: pxa/poodle: Remove hardcoded partitioning, use sharpslpart parser ARM: pxa/spitz: Remove hardcoded partitioning, use sharpslpart parser ARM: pxa/tosa: Remove hardcoded partitioning, use sharpslpart parser ARM: pxa/corgi: Remove hardcoded partitioning, use sharpslpart parser ARM: pxa: move header file out of I2C realm ARM: pxa: move declarations to proper place Signed-off-by: Olof Johansson <[email protected]>
2018-01-04Merge tag 'omap-for-v4.16/defconfig-signed' of ↵Olof Johansson2-0/+14
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Two defconfig updates for omaps These are to configure dra7 PCIe for omap2plus_defconfig and multi_v7_defconfig. * tag 'omap-for-v4.16/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: multi_v7_defconfig: Enable CONFIG_PCI_DRA7XX (Host & Device modes) ARM: omap2plus_defconfig: Enable CONFIG_PCI_DRA7XX (Host & Device modes) Signed-off-by: Olof Johansson <[email protected]>
2018-01-04Merge tag 'omap-for-v4.16/soc-pt2-signed' of ↵Olof Johansson10-496/+50
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Second set of SoC changes for omaps for v4.16 merge window We can now drop some more of legacy platform data for omap3 as it's been booting in device tree only mode for quite a while now. This clock related data is coming from device tree configured clocks now. The other changes add support for detecting new dra762 SoC variant. * tag 'omap-for-v4.16/soc-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: dra762: Register package specific hwmod ARM: OMAP2+: dra762: Add support for device package identification ARM: OMAP2+: Drop unused legacy data for prcm_reg_id and module_bit Signed-off-by: Olof Johansson <[email protected]>
2018-01-04Merge tag 'mvebu-arm64-4.16-1' of git://git.infradead.org/linux-mvebu into ↵Olof Johansson1-0/+1
next/soc mvebu arm64 for 4.16 (part 1) Adding the cpu frequency scaling support for Armada 37xx * tag 'mvebu-arm64-4.16-1' of git://git.infradead.org/linux-mvebu: arm64: defconfig: enable ARM_ARMADA_37XX_CPUFREQ Signed-off-by: Olof Johansson <[email protected]>
2018-01-04Merge tag 'renesas-soc2-for-v4.16' of ↵Olof Johansson1-1/+1
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Second Round of Renesas ARM Based SoC Updates for v4.16 * rcar-sysc: Keep wakeup sources active during system suspend Geert Uytterhoeven says "If an R-Car SYSC slave device is part of the CPG/MSTP or CPG/MSSR Clock Domain and to be used as a wakeup source, it must be kept active during system suspend. Currently this is handled in device-specific drivers by explicitly increasing the use count of the module clock when the device is configured as a wakeup source. However, the proper way to prevent the device from being stopped is to inform this requirement to the genpd core, by setting the GENPD_FLAG_ACTIVE_WAKEUP flag. Note that this will only affect devices configured as wakeup sources." * tag 'renesas-soc2-for-v4.16' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: soc: renesas: rcar-sysc: Keep wakeup sources active during system suspend Signed-off-by: Olof Johansson <[email protected]>
2018-01-04Merge tag 'renesas-defconfig-for-v4.16' of ↵Olof Johansson2-0/+3
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Renesas ARM Based SoC Defconfig Updates for v4.16 shmobile_defconfig: * Enable PWM timers, which are present on R-Car and RZ/G1 platforms, as a built-in * Enable SGTL5000 audio codec, which is present on the he iWave RZ/G1M Q7 carrier board, as a built-in multi_v7_defconfig: * Enable PWM timers, which are present on R-Car and RZ/G1 platforms, as a module * tag 'renesas-defconfig-for-v4.16' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: defconfig: Enable PWM ARM: multi_v7_defconfig: Select PWM_RCAR as module ARM: shmobile: defconfig: Enable SGTL5000 audio codec Signed-off-by: Olof Johansson <[email protected]>
2018-01-04soc: Add SoC driver for GeminiLinus Walleij3-0/+74
This adds an SoC driver for the Gemini. Currently there is only one thing not fitting into any other framework, and that is the bus arbitration setting. All Gemini vendor trees seem to be setting this register to exactly the same arbitration so we just add a small code snippet to do this at subsys_init() time before any other drivers kick in. Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2017-12-21arm64: defconfig: remove CONFIG_USB_QCOM_8X16_PHYAlex Elder1-1/+0
No Qualcomm SoC requires the "phy-qcom-8x16-usb.c" USB phy driver support any more. Remove the code, and remove the config option from the arm64 defconfig. Suggested-by: Stephen Boyd <[email protected]> Signed-off-by: Alex Elder <[email protected]> Reviewed-by: Amit Kucheria <[email protected]> Acked-by: Bjorn Andersson <[email protected]> Acked-by: Andy Gross <[email protected]> Signed-off-by: Andy Gross <[email protected]>
2017-12-21arm64: defconfig: remove CONFIG_USB_MSM_OTGAlex Elder1-1/+0
No Qualcomm SoC requires the "phy-msm-usb.c" USB phy driver support any more. Remove the code, and remove the config option from the arm64 defconfig. Suggested-by: Stephen Boyd <[email protected]> Signed-off-by: Alex Elder <[email protected]> Reviewed-by: Amit Kucheria <[email protected]> Acked-by: Bjorn Andersson <[email protected]> Acked-by: Andy Gross <[email protected]> Signed-off-by: Andy Gross <[email protected]>
2017-12-21arm64: defconfig: remove CONFIG_USB_EHCI_MSMAlex Elder1-1/+0
No Qualcomm SoC requires the "ehci-msm.c" code any more. So remove the code, and remove the config option from the arm64 defconfig. Suggested-by: Stephen Boyd <[email protected]> Signed-off-by: Alex Elder <[email protected]> Reviewed-by: Amit Kucheria <[email protected]> Acked-by: Bjorn Andersson <[email protected]> Acked-by: Andy Gross <[email protected]> Signed-off-by: Andy Gross <[email protected]>
2017-12-21Merge tag 'v4.15-next-soc' of ↵Arnd Bergmann6-23/+181
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into next/soc Pull "arm: Updates for soc driver for v4.15-next" from Matthias Brugger: - change kconfig entry for armv7 SoCs to be more generic - add support for mt2701 scpsys driver binding documentation extend driver to allow the bus protection to overwrite the register * tag 'v4.15-next-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: soc: mediatek: add MT2712 scpsys support soc: mediatek: add dependent clock jpgdec/audio for scpsys soc: mediatek: extend bus protection API dt-bindings: soc: add MT2712 power dt-bindings ARM: mediatek: use more generic prompts for SoCs with ARMv7
2017-12-21Merge tag 'tegra-for-4.16-soc-2' of ↵Arnd Bergmann11-237/+322
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc Pull "soc/tegra: Changes for v4.16-rc1" from Thierry Reding: Fuse and chip ID support for Tegra186 is added in this set of changes, followed by some unification work for the PMC driver in order to avoid code duplication between Tegra186 and prior chips. This also contains a couple of fixes for reading fuses on Tegra20. * tag 'tegra-for-4.16-soc-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux: soc/tegra: fuse: Explicitly request DMA channel from APB DMA driver soc/tegra: fuse: Fix reading registers using DMA on Tegra20 soc/tegra: pmc: Consolidate Tegra186 support soc/tegra: pmc: Parameterize driver soc/tegra: fuse: Add Tegra186 chip ID support soc/tegra: fuse: Warn if accessing unmapped registers soc/tegra: fuse: Move register mapping check soc/tegra: fuse: Add Tegra186 support dt-bindings: misc: Add Tegra186 MISC registers bindings
2017-12-21Merge tag 'samsung-defconfig-4.16' of ↵Arnd Bergmann2-0/+12
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc Pull "Samsung defconfig changes for v4.16" from Krzysztof Kozłowski: 1. Enable missing drivers for supported Exynos boards (PMU, CEC, MHL bridge, ASoC for Odroid XU3/XU4). 2. Enable Exynos IOMMU driver on exynos_defconfig. * tag 'samsung-defconfig-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: exynos_defconfig: Enable CONFIG_EXYNOS_IOMMU ARM: multi_v7_defconfig: Enable missing drivers for supported Exynos boards ARM: exynos_defconfig: Enable missing drivers for supported Exynos boards
2017-12-21Merge tag 'omap-for-v4.15/defconfig-v2-signed' of ↵Arnd Bergmann1-0/+11
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Pull "One old minor pull request pending" from Tony Lindgren: Few omap2plus_defconfig changes for v4.15 merge window to enable NEON based crypto and droid 4 USB PHY. * tag 'omap-for-v4.15/defconfig-v2-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: omap2plus_defconfig: Enable droid 4 USB PHY ARM: omap2plus_defconfig: enable NEON based crypto
2017-12-21Merge tag 'omap-for-v4.16/soc-signed' of ↵Arnd Bergmann10-64/+68
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Pull "SoC changes for omaps for v4.16 merge window" from Tony Lindgren: For most part this is a series from Tero Kristo to prepare things for using clkctrl clocks with DTS data. The other changes are to make few data structures const. * tag 'omap-for-v4.16/soc-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: CM: make cm_ll_data structures as const ARM: OMAP2+: CM: make some pointers and function arguments as const ARM: DM816x: hwmod_data: fix clockdomain name for sata hwmod ARM: OMAP2+: hwmod: calculate physical register address on am33xx ARM: AM33xx: CM: add support for getting physical address for a register ARM: OMAP2+: clockdomain: remove the obsolete clkdm_xlate_address API ARM: OMAP2+: hwmod: fix clkctrl address translation logic ARM: OMAP4: CMINST: add support for translating clkctrl addresses ARM: OMAP2+: CM: add support for getting phys address for a clkctrl register
2017-12-21Merge tag 'bk3' of https://github.com/sverdlin/ep93xx into next/socArnd Bergmann5-12/+176
Pull "ARM: ep93xx: ts72xx: Add support for BK3 board" from Alexander Sverdlin: This patch series adds support for Liebherr's BK3 board, being a derivative of TS72XX design. * tag 'bk3' of https://github.com/sverdlin/ep93xx: ARM: ep93xx: ts72xx: Add support for BK3 board - ts72xx derivative ARM: ep93xx: ts72xx: cosmetic: Add some description to ts72xx code ARM: ep93xx: ts72xx: Rewrite ts72xx_register_flash() to accept parameters ARM: ep93xx: ts72xx: Provide include guards for ts72xx.h file
2017-12-21soc/tegra: fuse: Explicitly request DMA channel from APB DMA driverDmitry Osipenko1-1/+8
Currently fuse driver requests DMA channel from an arbitrary DMA device, it is not a problem since there is only one DMA provider for Tegra20 yet, but it may become troublesome if another provider will appear. Signed-off-by: Dmitry Osipenko <[email protected]> Acked-by: Jon Hunter <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2017-12-21soc/tegra: fuse: Fix reading registers using DMA on Tegra20Dmitry Osipenko2-1/+4
FUSE driver doesn't configure DMA channel properly, because of it DMA transfer is never issued and tegra20_fuse_read() always return 0x0. Signed-off-by: Dmitry Osipenko <[email protected]> Acked-by: Jon Hunter <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2017-12-21arm64: defconfig: enable CONFIG_UNIPHIER_EFUSEKeiji Hayashibara1-0/+1
Enable the efuse driver for UniPhier SoC Signed-off-by: Keiji Hayashibara <[email protected]> Acked-by: Masahiro Yamada <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2017-12-21MAINTAINERS: Add self as extended maintainer for a slew of filesLinus Walleij1-36/+27
Take over sole maintenance of Nomadik, U300 and Ux500. Since all are Device Tree converted and using standard format drivers this is not burdensome. Alessandro is not working on this platform any more. Let's use one single git tree for all of them and combine the MAINTAINERS entries into one. Suggested-by: Krzysztof Kozlowski <[email protected]> Acked-by: Alessandro Rubini <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2017-12-21Merge tag 'renesas-soc-for-v4.16' of ↵Arnd Bergmann1-0/+3
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Pull "Renesas ARM Based SoC Updates for v4.16" from Simon Horman: * Identify R-Car M3-W ES1.1 Geert Uytterhoeven says "The Product Register of R-Car M3-W ES1.1 incorrectly identifies the SoC revision as ES2.0. Add a workaround to fix this." It is my understanding that this is likely to be forwards-compatibile. * tag 'renesas-soc-for-v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas: soc: renesas: Identify R-Car M3-W ES1.1
2017-12-21arm64: defconfig: enable new trigger modes for ledsAmit Kucheria1-0/+2
Most development boards and devices have one or more LEDs. It is useful during debugging if they can be wired to show different behaviours such as disk or cpu activity or a load-average dependent heartbeat. Enable panic and disk activity triggers so they can be tied to LED activity during debugging as well. Signed-off-by: Amit Kucheria <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2017-12-21ARM: multi_v7_defconfig: Enable CONFIG_PCI_DRA7XX (Host & Device modes)Kishon Vijay Abraham I1-0/+6
Enable CONFIG_PCI_DRA7XX in order to be able to configure PCIe controller present in dra7 SoCs in both host mode and device mode. Signed-off-by: Kishon Vijay Abraham I <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2017-12-21ARM: omap2plus_defconfig: Enable CONFIG_PCI_DRA7XX (Host & Device modes)Kishon Vijay Abraham I1-0/+8
Enable CONFIG_PCI_DRA7XX in order to be able to configure PCIe controller present in dra7 SoCs in both host mode and device mode. Signed-off-by: Kishon Vijay Abraham I <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2017-12-21ARM: OMAP2+: dra762: Register package specific hwmodLokesh Vutla1-8/+19
Register dra762 abz package specific hwmod. Also move registering rtc hwmod into respective SoC conditional statements instead of doing it separately. Signed-off-by: Lokesh Vutla <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2017-12-21ARM: OMAP2+: dra762: Add support for device package identificationLokesh Vutla2-2/+31
dra762 comes in two packages: - ABZ: Pin compatible package with DRA742 and DDR@1333MHz - ACD: High performance(OPP_PLUS) package with new IPs Both the above packages uses the same IDCODE hence needs to differentiate using package information in DIE_ID_2. Add support for the same. Signed-off-by: Lokesh Vutla <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2017-12-21arm64: defconfig: enable ARM_ARMADA_37XX_CPUFREQGregory CLEMENT1-0/+1
Add the cpu frequency scaling support for Armada 37xx by default, this should allow a better coverage in kernel continuous integration tests. Signed-off-by: Gregory CLEMENT <[email protected]>
2017-12-21Merge remote-tracking branch 'mainline-kernel/v4.15-next/pdids' into ↵Matthias Brugger2-0/+29
v4.15-next/soc
2017-12-21soc: mediatek: add MT2712 scpsys support[email protected]1-6/+100
add scpsys driver for MT2712 Signed-off-by: Weiyi Lu <[email protected]> Signed-off-by: Matthias Brugger <[email protected]>
2017-12-21soc: mediatek: add dependent clock jpgdec/audio for scpsys[email protected]1-1/+5
There are dependent clock jpgdec/audio in scpsys on MT2712, and will exist three dependent clocks on MT2712 VDEC. Signed-off-by: Weiyi Lu <[email protected]> Signed-off-by: Matthias Brugger <[email protected]>
2017-12-21soc: mediatek: extend bus protection API[email protected]3-15/+46
MT2712 add "set/clear" bus control register to each control register set instead of providing only one "enable" control register, we could avoid the read-modify-write racing by declaring "bus_prot_reg_update" as "false" in scp_soc_data or declaring as "true" to use the legacy update method. By improving the mtk-infracfg bus protection implementation to support set/clear bus protection control method by IC configuration. Signed-off-by: Weiyi Lu <[email protected]> Signed-off-by: Matthias Brugger <[email protected]>
2017-12-21dt-bindings: soc: add MT2712 power dt-bindings[email protected]2-0/+29
Add power dt-bindings for MT2712. Acked-by: Rob Herring <[email protected]> Signed-off-by: Weiyi Lu <[email protected]> Signed-off-by: Matthias Brugger <[email protected]>
2017-12-20ARM: pxa/lubbock: add GPIO driver for LUB_MISC_WR registerRussell King2-8/+17
Add a gpio driver for the lubbock miscellaneous write IO register so we can take advantage of subsystems modelled around gpiolib, rather than having to provide platform specific callbacks. Signed-off-by: Russell King <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Signed-off-by: Robert Jarzmik <[email protected]>
2017-12-20ARM: mediatek: use more generic prompts for SoCs with ARMv7Sean Wang1-1/+1
Supported MediaTek SoCs with ARMv7 are not limited within MT65xx or MT81xx and thus use more generic words to prompt users as the other vendors usually use. Signed-off-by: Sean Wang <[email protected]> Signed-off-by: Matthias Brugger <[email protected]>
2017-12-20soc: renesas: rcar-sysc: Keep wakeup sources active during system suspendGeert Uytterhoeven1-1/+1
If an R-Car SYSC slave device is part of the CPG/MSTP or CPG/MSSR Clock Domain and to be used as a wakeup source, it must be kept active during system suspend. Currently this is handled in device-specific drivers by explicitly increasing the use count of the module clock when the device is configured as a wakeup source. However, the proper way to prevent the device from being stopped is to inform this requirement to the genpd core, by setting the GENPD_FLAG_ACTIVE_WAKEUP flag. Note that this will only affect devices configured as wakeup sources. Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Ulf Hansson <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2017-12-20ARM: shmobile: defconfig: Enable PWMFabrizio Castro1-0/+1
RZ/G1 and R-Car platforms have PWM timers. This patch enables PWM support by default. Signed-off-by: Fabrizio Castro <[email protected]> Reviewed-by: Biju Das <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2017-12-20ARM: multi_v7_defconfig: Select PWM_RCAR as moduleFabrizio Castro1-0/+1
Enable PWM support for R-Car and friends by default. Signed-off-by: Fabrizio Castro <[email protected]> Reviewed-by: Biju Das <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2017-12-18ARM: shmobile: defconfig: Enable SGTL5000 audio codecBiju Das1-0/+1
The iWave RZ/G1M Q7 carrier board supports I2S audio codec "SGTL5000". To increase hardware support enable the driver in the shmobile_defconfig multiplatform configuration. Signed-off-by: Biju Das <[email protected]> Reviewed-by: Fabrizio Castro <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2017-12-17Linux 4.15-rc4Linus Torvalds1-1/+1
2017-12-17Revert "exec: avoid RLIMIT_STACK races with prlimit()"Kees Cook1-6/+1
This reverts commit 04e35f4495dd560db30c25efca4eecae8ec8c375. SELinux runs with secureexec for all non-"noatsecure" domain transitions, which means lots of processes end up hitting the stack hard-limit change that was introduced in order to fix a race with prlimit(). That race fix will need to be redesigned. Reported-by: Laura Abbott <[email protected]> Reported-by: Tomáš Trnka <[email protected]> Cc: [email protected] Signed-off-by: Kees Cook <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2017-12-17Merge branch 'WIP.x86-pti.base-for-linus' of ↵Linus Torvalds0-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull Page Table Isolation (PTI) v4.14 backporting base tree from Ingo Molnar: "This tree contains the v4.14 PTI backport preparatory tree, which consists of four merges of upstream trees and 7 cherry-picked commits, which the upcoming PTI work depends on" NOTE! The resulting tree is exactly the same as the original base tree (ie the diff between this commit and its immediate first parent is empty). The only reason for this merge is literally to have a common point for the actual PTI changes so that the commits can be shared in both the 4.15 and 4.14 trees. * 'WIP.x86-pti.base-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mm/kasan: Don't use vmemmap_populate() to initialize shadow locking/barriers: Convert users of lockless_dereference() to READ_ONCE() locking/barriers: Add implicit smp_read_barrier_depends() to READ_ONCE() bpf: fix build issues on um due to mising bpf_perf_event.h perf/x86: Enable free running PEBS for REGS_USER/INTR x86: Make X86_BUG_FXSAVE_LEAK detectable in CPUID on AMD x86/cpufeature: Add User-Mode Instruction Prevention definitions
2017-12-17Merge branch 'WIP.x86-pti.base.prep-for-linus' of ↵Linus Torvalds2-4/+4
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull Page Table Isolation (PTI) preparatory tree from Ingo Molnar: "This does a rename to free up linux/pti.h to be used by the upcoming page table isolation feature" * 'WIP.x86-pti.base.prep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: drivers/misc/intel/pti: Rename the header file to free up the namespace
2017-12-17Merge branch 'timers-urgent-for-linus' of ↵Linus Torvalds1-12/+17
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull timer fix from Thomas Gleixner: "A single bugfix which prevents arbitrary sigev_notify values in posix-timers" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: posix-timer: Properly check sigevent->sigev_notify
2017-12-17Merge tag 'dmaengine-fix-4.15-rc4' of ↵Linus Torvalds5-41/+52
git://git.infradead.org/users/vkoul/slave-dma Pull dmaengine fixes from Vinod Koul: "This time consisting of fixes in a bunch of drivers and the dmatest module: - Fix for disable clk on error path in fsl-edma driver - Disable clk fail fix in jz4740 driver - Fix long pending bug in dmatest driver for dangling pointer - Fix potential NULL pointer dereference in at_hdmac driver - Error handling path in ioat driver" * tag 'dmaengine-fix-4.15-rc4' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: fsl-edma: disable clks on all error paths dmaengine: jz4740: disable/unprepare clk if probe fails dmaengine: dmatest: move callback wait queue to thread context dmaengine: at_hdmac: fix potential NULL pointer dereference in atc_prep_dma_interleaved dmaengine: ioat: Fix error handling path
2017-12-17cramfs: fix MTD dependencyArnd Bergmann1-0/+1
With CONFIG_MTD=m and CONFIG_CRAMFS=y, we now get a link failure: fs/cramfs/inode.o: In function `cramfs_mount': inode.c:(.text+0x220): undefined reference to `mount_mtd' fs/cramfs/inode.o: In function `cramfs_mtd_fill_super': inode.c:(.text+0x6d8): undefined reference to `mtd_point' inode.c:(.text+0xae4): undefined reference to `mtd_unpoint' This adds a more specific Kconfig dependency to avoid the broken configuration. Alternatively we could make CRAMFS itself depend on "MTD || !MTD" with a similar result. Fixes: 99c18ce580c6 ("cramfs: direct memory access support") Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Nicolas Pitre <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2017-12-17Merge branch 'for-linus' of ↵Linus Torvalds2-19/+19
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull vfs fixes from Al Viro: "The alloc_super() one is a regression in this merge window, lazytime thing is older..." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: VFS: Handle lazytime in do_mount() alloc_super(): do ->s_umount initialization earlier
2017-12-17Merge tag 'ext4_for_stable' of ↵Linus Torvalds4-0/+16
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 Pull ext4 fixes from Ted Ts'o: "Fix a regression which caused us to fail to interpret symlinks in very ancient ext3 file system images. Also fix two xfstests failures, one of which could cause an OOPS, plus an additional bug fix caught by fuzz testing" * tag 'ext4_for_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: fix crash when a directory's i_size is too small ext4: add missing error check in __ext4_new_inode() ext4: fix fdatasync(2) after fallocate(2) operation ext4: support fast symlinks from ext3 file systems
Powered by cgit, Gruvboxed by Blaster4385.