Changes in Makefile

762f99f4f3cb41a775b5157dd761217beba65873 - Merge branch 'next' into for-linus

Sat, 15 Jan 2022 21:09:44 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.17 merge window. List of files: /linux/arch/mips/loongson2ef/common/Makefile

8632987380765dee716d460640aa58d58d52998e - Merge branch 'reset/of-get-optional-exclusive' of git://git.pengutronix.de/pza/linux into timers/drivers/next

Thu, 09 Dec 2021 13:57:57 +0100

Merge branch 'reset/of-get-optional-exclusive' of git://git.pengutronix.de/pza/linux into timers/drivers/next"Add optional variant of of_reset_control_get_exclusive(). If therequested reset is not specified in the device tree, this functionreturns NULL instead of an error."This dependency is needed for the Generic Timer Module (a.k.a OSTM)support for RZ/G2L.Signed-off-by: Daniel Lezcano List of files: /linux/arch/mips/loongson2ef/common/Makefile

5d8dfaa71d87f742c53309b95cb6a8b274119027 - Merge tag 'v5.15' into next

Thu, 09 Dec 2021 08:43:50 +0100

Merge tag 'v5.15' into nextSync up with the mainline to get the latest APIs and DT bindings. List of files: /linux/arch/mips/loongson2ef/common/Makefile

820e9906cf64142169134f35b996108303cf22ca - Merge branch 'for-5.16/asus' into for-linus

Fri, 05 Nov 2021 12:10:27 +0100

Merge branch 'for-5.16/asus' into for-linus List of files: /linux/arch/mips/loongson2ef/common/Makefile

40e64a88dadcfa168914065baf7f035de957bbe0 - Merge branch 'for-5.16-vsprintf-pgp' into for-linus

Tue, 02 Nov 2021 10:39:27 +0100

Merge branch 'for-5.16-vsprintf-pgp' into for-linus List of files: /linux/arch/mips/loongson2ef/common/Makefile

e700ac213a0f793fb4f83098413303e3dd080892 - Merge branch 'pruss-fix' into fixes

Wed, 06 Oct 2021 06:55:44 +0200

Merge branch 'pruss-fix' into fixesMerge in a fix for pruss reset issue caused by enabling pruss for am335x. List of files: /linux/arch/mips/loongson2ef/common/Makefile

ffb1e76f4f32d2b8ea4189df0484980370476395 - Merge tag 'v5.15-rc2' into spi-5.15

Mon, 20 Sep 2021 16:56:58 +0200

Merge tag 'v5.15-rc2' into spi-5.15Linux 5.15-rc2 List of files: /linux/arch/mips/loongson2ef/common/Makefile

d1b803f4ca4f25d6f171219d039f9410a10b29ee - Merge drm/drm-next into drm-intel-next

Wed, 15 Sep 2021 16:12:51 +0200

Merge drm/drm-next into drm-intel-nextCatch-up on 5.15-rc1 and sync with drm-intel-gt-nextto prepare the PXP topic branch.Signed-off-by: Rodrigo Vivi List of files: /linux/arch/mips/loongson2ef/common/Makefile

d5dd580deb54483cce0cb5bbe3f1a132a28c767d - Merge drm/drm-next into drm-intel-gt-next

Wed, 15 Sep 2021 12:23:27 +0200

Merge drm/drm-next into drm-intel-gt-nextClose the divergence which has caused patches not to apply andhave a solid baseline for the PXP patches that Rodrigo will senda topic branch PR for.Signed-off-by: Joonas Lahtinen List of files: /linux/arch/mips/loongson2ef/common/Makefile

2f76520561d01a5f37e6d6ed2c2e441b6a355a96 - Merge drm/drm-next into drm-misc-next

Tue, 14 Sep 2021 09:25:30 +0200

Merge drm/drm-next into drm-misc-nextKickstart new drm-misc-next cycle.Signed-off-by: Maxime Ripard List of files: /linux/arch/mips/loongson2ef/common/Makefile

c2f4954c2d3fc4f77b46c67585e17a58df4ba8e4 - Merge branch 'linus' into smp/urgent

Sat, 11 Sep 2021 00:38:47 +0200

Merge branch 'linus' into smp/urgentEnsure that all usage sites of get/put_online_cpus() except for thestruggler in drivers/thermal are gone. So the last user and the deprecatedinlines can be removed. List of files: /linux/arch/mips/loongson2ef/common/Makefile

d6742212c0c6ccee2351499db80acba71fa36052 - Merge tag 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Fri, 03 Sep 2021 20:11:54 +0200

Merge tag 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linuxPull MIPS updates from Thomas Bogendoerfer: - converted Pistachio platform to use MIPS generic kernel - fixes and cleanups* tag 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (29 commits) MIPS: Malta: fix alignment of the devicetree buffer MIPS: ingenic: Unconditionally enable clock of CPU #0 MIPS: mscc: ocelot: mark the phy-mode for internal PHY ports MIPS: mscc: ocelot: disable all switch ports by default MAINTAINERS: adjust PISTACHIO SOC SUPPORT after its retirement MIPS: Return true/false (not 1/0) from bool functions MIPS: generic: Return true/false (not 1/0) from bool functions MIPS: Make a alias for pistachio_defconfig MIPS: Retire MACH_PISTACHIO MIPS: config: generic: Add config for Marduk board pinctrl: pistachio: Make it as an option phy: pistachio-usb: Depend on MIPS || COMPILE_TEST clocksource/drivers/pistachio: Make it selectable for MIPS clk: pistachio: Make it selectable for generic MIPS kernel MIPS: DTS: Pistachio add missing cpc and cdmm MIPS: generic: Allow generating FIT image for Marduk board MIPS: locking/atomic: Fix atomic{_64,}_sub_if_positive MIPS: loongson2ef: don't build serial.o unconditionally MIPS: Replace deprecated CPU-hotplug functions. MIPS: Alchemy: Fix spelling contraction "cant" -> "can't" ... List of files: /linux/arch/mips/loongson2ef/common/Makefile

ad548993a66c498267695edd8b19a682be0e3a8b - MIPS: loongson2ef: don't build serial.o unconditionally

Thu, 05 Aug 2021 02:02:16 +0200

MIPS: loongson2ef: don't build serial.o unconditionallyLOONGSON_UART_BASE depends on EARLY_PRINTK || SERIAL_8250, but whenneither of these Kconfig symbols is set, the kernel build has errors:../arch/mips/loongson2ef/common/serial.c: In function 'serial_init':../arch/mips/loongson2ef/common/serial.c:66:25: error: 'loongson_uart_base' undeclared (first use in this function) 66 | loongson_uart_base;../arch/mips/loongson2ef/common/serial.c:66:25: note: each undeclared identifier is reported only once for each function it appears in../arch/mips/loongson2ef/common/serial.c:68:41: error: '_loongson_uart_base' undeclared (first use in this function) 68 | (void __iomem *)_loongson_uart_base;Fix this by building serial.o only when one (or both) of theseKconfig symbols is enabled.Tested with: (a) EARLY_PRINTK=y, SERIAL_8250 not set; (b) EARLY_PRINTK=y, SERIAL_8250=y; (c) EARLY_PRINTK=y, SERIAL_8250=m. (d) EARLY_PRINTK not set, SERIAL_8250=y; (e) EARLY_PRINTK not set, SERIAL_8250=m; (f) EARLY_PRINTK not set, SERIAL_8250 not set.Signed-off-by: Randy Dunlap Reported-by: kernel test robot Cc: Jiaxun Yang Cc: Thomas Bogendoerfer Cc: linux-mips@vger.kernel.orgSigned-off-by: Thomas Bogendoerfer List of files: /linux/arch/mips/loongson2ef/common/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/arch/mips/loongson2ef/common/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/arch/mips/loongson2ef/common/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/arch/mips/loongson2ef/common/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/arch/mips/loongson2ef/common/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/arch/mips/loongson2ef/common/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/arch/mips/loongson2ef/common/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/arch/mips/loongson2ef/common/Makefile