Changes in Makefile

c95baf12f5077419db01313ab61c2aac007d40cd - Merge drm-intel-next-queued into gvt-next

Thu, 20 Feb 2020 09:23:37 +0100

Merge drm-intel-next-queued into gvt-nextBackmerge to pull inhttps://patchwork.freedesktop.org/patch/353621/?series=73544&rev=1Signed-off-by: Zhenyu Wang List of files: /linux/drivers/soc/fsl/Makefile

28336be568bb473d16ba80db0801276fb4f1bbe5 - Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

Mon, 30 Dec 2019 08:10:51 +0100

Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflictsConflicts: init/main.c lib/Kconfig.debugSigned-off-by: Ingo Molnar List of files: /linux/drivers/soc/fsl/Makefile

b19efcabb587e5470a423ef778905f47e5a47f1a - Merge branch 'next' into for-linus

Sat, 01 Feb 2020 02:42:33 +0100

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

1bdd3e05a0a3b4a97ea88bc46fef8fb265c8b94c - Merge tag 'v5.5-rc5' into next

Fri, 10 Jan 2020 23:56:04 +0100

Merge tag 'v5.5-rc5' into nextSync up with mainline to get SPI "delay" API changes. List of files: /linux/drivers/soc/fsl/Makefile

22164fbe274c2dd96d2887fe121896d321000a61 - Merge drm/drm-next into drm-misc-next

Mon, 06 Jan 2020 10:35:33 +0100

Merge drm/drm-next into drm-misc-nextRequested, and we need v5.5-rc1 backported as our current branch is still based on v5.4.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/soc/fsl/Makefile

1e5f8a308551b9816588e12bb795aeadebe37c4a - Merge tag 'v5.5-rc3' into sched/core, to pick up fixes

Wed, 25 Dec 2019 10:41:37 +0100

Merge tag 'v5.5-rc3' into sched/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/soc/fsl/Makefile

57e04eeda515ee979fec3bc3d64c408feae18acc - Merge tag 'perf-urgent-for-mingo-5.5-20191216' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Tue, 17 Dec 2019 12:28:02 +0100

Merge tag 'perf-urgent-for-mingo-5.5-20191216' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgentPull perf/urgent fixes:perf top: Arnaldo Carvalho de Melo: - Do not bail out when perf_env__read_cpuid() returns ENOSYS, which has been reported happening on aarch64.perf metricgroup: Kajol Jain: - Fix printing event names of metric group with multiple eventsvendor events:x86: Ravi Bangoria: - Fix Kernel_Utilization metric.s390: Ed Maste: - Fix counter long description for DTLB1_GPAGE_WRITES and L1D_RO_EXCL_WRITES.perf header: Michael Petlan: - Fix false warning when there are no duplicate cache entrieslibtraceevent: Sudip Mukherjee: - Allow custom libdir pathAPI headers: Arnaldo Carvalho de Melo: - Sync linux/kvm.h with the kernel sources.Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Ingo Molnar List of files: /linux/drivers/soc/fsl/Makefile

761bfc33dd7504de951aa7b9db27a3cc5df1fde6 - Merge remote-tracking branch 'torvalds/master' into perf/urgent

Wed, 11 Dec 2019 13:58:16 +0100

Merge remote-tracking branch 'torvalds/master' into perf/urgentTo pick up BPF fixes to allow a clean 'make -C tools/perf build-test': 7c3977d1e804 libbpf: Fix sym->st_value print on 32-bit arches 1fd450f99272 libbpf: Fix up generation of bpf_helper_defs.hSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux/drivers/soc/fsl/Makefile

023265ed75d8792ca1d555430a8985511d3f8788 - Merge drm/drm-next into drm-intel-next-queued

Wed, 11 Dec 2019 09:35:37 +0100

Merge drm/drm-next into drm-intel-next-queuedSync up with v5.5-rc1 to get the updated lock_release() API among otherthings. Fix the conflict reported by Stephen Rothwell [1].[1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.auSigned-off-by: Jani Nikula List of files: /linux/drivers/soc/fsl/Makefile

2040cf9f59037aa8aec749363e69ead165b67b43 - Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts

Tue, 10 Dec 2019 10:11:00 +0100

Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflictsSigned-off-by: Ingo Molnar List of files: /linux/drivers/soc/fsl/Makefile

942e6f8a8314e5550e254519dfba4ccd5170421d - Merge mainline/master into arm/fixes

Thu, 05 Dec 2019 22:16:58 +0100

Merge mainline/master into arm/fixesThis brings in the mainline tree right after armsoc contents was mergedthis release cycle, so that we can re-run savedefconfig, etc.Signed-off-by: Olof Johansson List of files: /linux/drivers/soc/fsl/Makefile

ec939e4c94bd3ef2fd4f34c15f8aaf79bd0c5ee1 - Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Thu, 05 Dec 2019 20:43:31 +0100

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/socPull ARM SoC driver updates from Olof Johansson: "Various driver updates for platforms: - A larger set of work on Tegra 2/3 around memory controller and regulator features, some fuse cleanups, etc.. - MMP platform drivers, in particular for USB PHY, and other smaller additions. - Samsung Exynos 5422 driver for DMC (dynamic memory configuration), and ASV (adaptive voltage), allowing the platform to run at more optimal operating points. - Misc refactorings and support for RZ/G2N and R8A774B1 from Renesas - Clock/reset control driver for TI/OMAP - Meson-A1 reset controller support - Qualcomm sdm845 and sda845 SoC IDs for socinfo"* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (150 commits) firmware: arm_scmi: Fix doorbell ring logic for !CONFIG_64BIT soc: fsl: add RCPM driver dt-bindings: fsl: rcpm: Add 'little-endian' and update Chassis definition memory: tegra: Consolidate registers definition into common header memory: tegra: Ensure timing control debug features are disabled memory: tegra: Introduce Tegra30 EMC driver memory: tegra: Do not handle error from wait_for_completion_timeout() memory: tegra: Increase handshake timeout on Tegra20 memory: tegra: Print a brief info message about EMC timings memory: tegra: Pre-configure debug register on Tegra20 memory: tegra: Include io.h instead of iopoll.h memory: tegra: Adapt for Tegra20 clock driver changes memory: tegra: Don't set EMC rate to maximum on probe for Tegra20 memory: tegra: Add gr2d and gr3d to DRM IOMMU group memory: tegra: Set DMA mask based on supported address bits soc: at91: Add Atmel SFR SN (Serial Number) support memory: atmel-ebi: switch to SPDX license identifiers memory: atmel-ebi: move NUM_CS definition inside EBI driver soc: mediatek: Refactor bus protection control soc: mediatek: Refactor sram control ... List of files: /linux/drivers/soc/fsl/Makefile

84a1b6e1d938be6a26a88083058884246415a5fc - Merge tag 'soc-fsl-next-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/drivers

Wed, 13 Nov 2019 07:59:23 +0100

Merge tag 'soc-fsl-next-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/driversNXP/FSL SoC driver updates for v5.5RCPM driver for ARM SoCs- add RCPM driver to manage the wakeup devices for QorIQ ARM SoCs (HW lowpower states are supported in PSCI firmware)- add API to PM wakeup framework to retrieve wakeup sources* tag 'soc-fsl-next-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux: soc: fsl: add RCPM driver dt-bindings: fsl: rcpm: Add 'little-endian' and update Chassis definition PM: wakeup: Add routine to help fetch wakeup source object.Link: https://lore.kernel.org/r/1573599595-31411-1-git-send-email-leoyang.li@nxp.comSigned-off-by: Olof Johansson List of files: /linux/drivers/soc/fsl/Makefile

3b8db0348c503823fb09b5f304b196c3362754ea - soc: fsl: add RCPM driver

Thu, 24 Oct 2019 11:26:44 +0200

soc: fsl: add RCPM driverThe NXP's QorIQ processors based on ARM Core have RCPM module(Run Control and Power Management), which performs system leveltasks associated with power management such as wakeup source control.Note that this driver will not support PowerPC based QorIQ processors,and it depends on PM wakeup source framework which provide collectwake information.Signed-off-by: Ran Wang Reviewed-by: Rafael J. Wysocki Signed-off-by: Li Yang List of files: /linux/drivers/soc/fsl/Makefile

0898782247ae533d1f4e47a06bc5d4870931b284 - Merge branch 'next' into for-linus

Mon, 16 Sep 2019 18:56:27 +0200

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

d3f9990f1b48514b33342612b51fad238592d774 - Merge branch 'for-next' into for-linus

Sat, 14 Sep 2019 17:24:57 +0200

Merge branch 'for-next' into for-linusSigned-off-by: Takashi Iwai List of files: /linux/drivers/soc/fsl/Makefile

6f50fa2a6f1395ad5f59ce7b87730f1f3ea19d76 - Merge branch 'master' into for-5.4/logitech

Fri, 23 Aug 2019 11:35:39 +0200

Merge branch 'master' into for-5.4/logitechSigned-off-by: Benjamin Tissoires List of files: /linux/drivers/soc/fsl/Makefile

75bf465f0bc33e9b776a46d6a1b9b990f5fb7c37 - Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

Fri, 23 Aug 2019 06:08:04 +0200

Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-nextThis merges in fixes for the XIVE interrupt controller which touch bothgeneric powerpc and PPC KVM code. To avoid merge conflicts, thesecommits will go upstream via the powerpc tree as well as the KVM tree.Signed-off-by: Paul Mackerras List of files: /linux/drivers/soc/fsl/Makefile

58e16d792a6a8c6b750f637a4649967fcac853dc - Merge branch 'ti-sysc-fixes' into fixes

Tue, 13 Aug 2019 12:40:10 +0200

Merge branch 'ti-sysc-fixes' into fixes List of files: /linux/drivers/soc/fsl/Makefile

cbd32a1c56e36fedaa93a727699188bd3e6e6f67 - Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent

Mon, 12 Aug 2019 14:36:27 +0200

Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgentPull a single EFI fix for v5.3 from Ard: - Fix mixed mode breakage in EFI config table handling for TPM. List of files: /linux/drivers/soc/fsl/Makefile