Changes in Makefile

d0034a7a4ac7fae708146ac0059b9c47a1543f0d - Merge branch 'next' into for-linus

Tue, 04 May 2021 20:46:00 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.13 merge window. List of files: /linux/drivers/soc/canaan/Makefile

e50fedec822efc7b7090f95862b782d91ca8aec0 - Merge branch 'for-5.13/surface-system-aggregator-intergration' into for-linus

Thu, 29 Apr 2021 21:45:19 +0200

Merge branch 'for-5.13/surface-system-aggregator-intergration' into for-linus- Surface Aggregator Module support from Maximilian Luz List of files: /linux/drivers/soc/canaan/Makefile

b7f8f259896f669f131713b0c74ba4d008daa71d - Merge tag 'v5.12-rc7' into ecryptfs/next

Mon, 19 Apr 2021 06:39:17 +0200

Merge tag 'v5.12-rc7' into ecryptfs/nextRequired to pick up idmapped mount changes which changed some functionparameters. List of files: /linux/drivers/soc/canaan/Makefile

a6ad93e37e76ec43c9cee6a91dd783fb854c2ff1 - Merge tag 'platform-drivers-x86-surface-aggregator-v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86 into for-5.13/surface-system-aggregator-intergration

Tue, 30 Mar 2021 09:17:09 +0200

Merge tag 'platform-drivers-x86-surface-aggregator-v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86 into for-5.13/surface-system-aggregator-intergrationPull immutable integration branch from Hans de Goede to have a stable base forSSAM (Surface System Aggregator Module) HID transport subsystem merge.=====Signed tag for the immutable platform-surface-aggregator-registrybranch for merging into other sub-systems.Note this is based on v5.12-rc2.===== List of files: /linux/drivers/soc/canaan/Makefile

5acac83bf2e42f51ab9fd315d657798754bf0bb8 - Merge tag 'v5.12-rc4' into next

Thu, 25 Mar 2021 19:46:10 +0100

Merge tag 'v5.12-rc4' into nextSync up with the mainline to bring in newest APIs. List of files: /linux/drivers/soc/canaan/Makefile

f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5 - Merge drm/drm-next into drm-misc-next

Tue, 16 Mar 2021 09:06:23 +0100

Merge drm/drm-next into drm-misc-nextNoralf needs some patches in 5.12-rc3, and we've been delaying the 5.12merge due to the swap issue so it looks like a good time.Signed-off-by: Maxime Ripard List of files: /linux/drivers/soc/canaan/Makefile

b470ebc9e0e57f53d1db9c49b8a3de4086babd05 - Merge tag 'irqchip-fixes-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Sun, 14 Mar 2021 16:34:35 +0100

Merge tag 'irqchip-fixes-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgentPull irqchip fixes from Marc Zyngier: - More compatible strings for the Ingenic irqchip (introducing the JZ4760B SoC) - Select GENERIC_IRQ_MULTI_HANDLER on the ARM ep93xx platform - Drop all GENERIC_IRQ_MULTI_HANDLER selections from the irqchip Kconfig, now relying on the architecture to get it right - Drop the debugfs_file field from struct irq_domain, now that debugfs can track things on its own List of files: /linux/drivers/soc/canaan/Makefile

35bb28ece90dfb7f72b77ba529f25f79323d9581 - Merge drm/drm-next into drm-intel-next

Thu, 11 Mar 2021 07:19:46 +0100

Merge drm/drm-next into drm-intel-nextSync up with upstream.Signed-off-by: Jani Nikula List of files: /linux/drivers/soc/canaan/Makefile

009ef05f98129aa91c62c3baab859ba593a15bb2 - Merge remote-tracking branch 'torvalds/master' into perf/core

Mon, 08 Mar 2021 14:11:33 +0100

Merge remote-tracking branch 'torvalds/master' into perf/coreTo pick up the fixes sent for v5.12 and continue development based onv5.12-rc2, i.e. without the swap on file bug.This also gets a slightly newer and better tools/perf/arch/arm/util/cs-etm.cpatch version, using the BIT() macro, that had already been slated tov5.13 but ended up going to v5.12-rc1 on an older version.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/drivers/soc/canaan/Makefile

4c9f4865f4604744d4f1a43db22ac6ec9dc8e587 - Merge branch 'fixes-rc2' into fixes

Mon, 08 Mar 2021 10:34:12 +0100

Merge branch 'fixes-rc2' into fixes List of files: /linux/drivers/soc/canaan/Makefile

9b838a3c32d7a1edd7edeec1bc455eca76622218 - Merge tag 'tags/sound-sdw-kconfig-fixes' into for-linus

Tue, 02 Mar 2021 18:30:07 +0100

Merge tag 'tags/sound-sdw-kconfig-fixes' into for-linusALSA/ASoC/SOF/SoundWire: fix Kconfig issuesIn January, Intel kbuild bot and Arnd Bergmann reported multipleissues with randconfig. This patchset builds on Arnd's suggestions toa) expose ACPI and PCI devices in separate modules, while sof-acpi-devand sof-pci-dev become helpers. This will result in minor changesrequired for developers/testers, i.e. modprobe snd-sof-pci will nolonger result in a probe. The SOF CI was already updated to deal withthis module dependency change and introduction of new modules.b) Fix SOF/SoundWire/DSP_config dependencies by moving the coderequired to detect SoundWire presence in ACPI tables to sound/hda.Link: https://lore.kernel.org/r/20210302003125.1178419-1-pierre-louis.bossart@linux.intel.com List of files: /linux/drivers/soc/canaan/Makefile

8b83369ddcb3fb9cab5c1088987ce477565bb630 - Merge tag 'riscv-for-linus-5.12-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

Fri, 26 Feb 2021 19:28:35 +0100

Merge tag 'riscv-for-linus-5.12-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linuxPull RISC-V updates from Palmer Dabbelt: "A handful of new RISC-V related patches for this merge window: - A check to ensure drivers are properly using uaccess. This isn't manifesting with any of the drivers I'm currently using, but may catch errors in new drivers. - Some preliminary support for the FU740, along with the HiFive Unleashed it will appear on. - NUMA support for RISC-V, which involves making the arm64 code generic. - Support for kasan on the vmalloc region. - A handful of new drivers for the Kendryte K210, along with the DT plumbing required to boot on a handful of K210-based boards. - Support for allocating ASIDs. - Preliminary support for kernels larger than 128MiB. - Various other improvements to our KASAN support, including the utilization of huge pages when allocating the KASAN regions. We may have already found a bug with the KASAN_VMALLOC code, but it's passing my tests. There's a fix in the works, but that will probably miss the merge window.* tag 'riscv-for-linus-5.12-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: (75 commits) riscv: Improve kasan population by using hugepages when possible riscv: Improve kasan population function riscv: Use KASAN_SHADOW_INIT define for kasan memory initialization riscv: Improve kasan definitions riscv: Get rid of MAX_EARLY_MAPPING_SIZE soc: canaan: Sort the Makefile alphabetically riscv: Disable KSAN_SANITIZE for vDSO riscv: Remove unnecessary declaration riscv: Add Canaan Kendryte K210 SD card defconfig riscv: Update Canaan Kendryte K210 defconfig riscv: Add Kendryte KD233 board device tree riscv: Add SiPeed MAIXDUINO board device tree riscv: Add SiPeed MAIX GO board device tree riscv: Add SiPeed MAIX DOCK board device tree riscv: Add SiPeed MAIX BiT board device tree riscv: Update Canaan Kendryte K210 device tree dt-bindings: add resets property to dw-apb-timer dt-bindings: fix sifive gpio properties dt-bindings: update sifive uart compatible string dt-bindings: update sifive clint compatible string ... List of files: /linux/drivers/soc/canaan/Makefile

c6ca7616f7d5c2ce166280107ba74db1d528fcb7 - clk: Add RISC-V Canaan Kendryte K210 clock driver

Wed, 10 Feb 2021 06:02:14 +0100

clk: Add RISC-V Canaan Kendryte K210 clock driverAdd a clock provider driver for the Canaan Kendryte K210 RISC-V SoC.This new driver with the compatible string "canaan,k210-clk" implementssupport for the full clock structure of the K210 SoC. Since it isrequired for the correct operation of the SoC, this driver isselected by default for compilation when the SOC_CANAAN option isselected.With this change, the k210-sysctl driver is turned into a simpleplatform driver which enables its power bus clock and triggerspopulating its child nodes. The sysctl driver retains the SOC earlyinitialization code, but the implementation now relies on the newfunction k210_clk_early_init() provided by the new clk-k210 driver.The clock structure implemented and many of the coding ideas for thedriver come from the work by Sean Anderson on the K210 support for theU-Boot project.Cc: Stephen Boyd Cc: Michael Turquette Cc: linux-clk@vger.kernel.orgSigned-off-by: Damien Le Moal Reviewed-by: Stephen Boyd Signed-off-by: Palmer Dabbelt List of files: /linux/drivers/soc/canaan/Makefile

08734e0581a54df77f1af354b93b02ac581e4fbb - riscv: Use vendor name for K210 SoC support

Sun, 13 Dec 2020 14:50:38 +0100

riscv: Use vendor name for K210 SoC supportRename configuration options and directories related to the KendryteK210 SoC to use the SoC vendor name (canaan) instead of the "kendryte"branding name.Signed-off-by: Damien Le Moal Reviewed-by: Anup Patel Signed-off-by: Palmer Dabbelt List of files: /linux/drivers/soc/canaan/Makefile