Changes in Makefile

a23e1966932464e1c5226cb9ac4ce1d5fc10ba22 - Merge branch 'next' into for-linus

Mon, 15 Jul 2024 23:03:44 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.11 merge window. List of files: /linux/arch/sh/drivers/Makefile

6f47c7ae8c7afaf9ad291d39f0d3974f191a7946 - Merge tag 'v6.9' into next

Tue, 28 May 2024 06:37:18 +0200

Merge tag 'v6.9' into nextSync up with the mainline to bring in the new cleanup API. List of files: /linux/arch/sh/drivers/Makefile

60a2f25de7b8b785baee2932db932ae9a5b8c86d - Merge drm/drm-next into drm-intel-gt-next

Thu, 16 May 2024 09:33:01 +0200

Merge drm/drm-next into drm-intel-gt-nextSome display refactoring patches are needed in order to allow conflict-less merging.Signed-off-by: Tvrtko Ursulin List of files: /linux/arch/sh/drivers/Makefile

0ea5c948cb64bab5bc7a5516774eb8536f05aa0d - Merge drm/drm-next into drm-intel-next

Mon, 15 Jan 2024 08:38:05 +0100

Merge drm/drm-next into drm-intel-nextBackmerge to bring Xe driver to drm-intel-next.Signed-off-by: Jani Nikula List of files: /linux/arch/sh/drivers/Makefile

03c11eb3b16dc0058589751dfd91f254be2be613 - Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branch

Wed, 14 Feb 2024 10:45:07 +0100

Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branchConflicts: arch/x86/include/asm/percpu.h arch/x86/include/asm/text-patching.hSigned-off-by: Ingo Molnar List of files: /linux/arch/sh/drivers/Makefile

ab1c247094e323177a578b38f0325bf79f0317ac - Merge remote-tracking branch 'torvalds/master' into perf-tools-next

Tue, 19 Dec 2023 01:37:07 +0100

Merge remote-tracking branch 'torvalds/master' into perf-tools-nextTo pick up fixes that went thru perf-tools for v6.7 and to get in syncwith upstream to check for drift in the copies of headers, etc.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/arch/sh/drivers/Makefile

6b93f350e55f3f2ee071dd41109d936abfba8ebf - Merge branch 'for-6.8/amd-sfh' into for-linus

Mon, 08 Jan 2024 20:57:04 +0100

Merge branch 'for-6.8/amd-sfh' into for-linus- addition of new interfaces to export User presence information and Ambient light from amd-sfh to other drivers within the kernel (Basavaraj Natikar) List of files: /linux/arch/sh/drivers/Makefile

3bf3e21c15d4386a5f15118ec39bbc1b67ea5759 - Merge drm/drm-next into drm-misc-next

Wed, 15 Nov 2023 10:45:19 +0100

Merge drm/drm-next into drm-misc-nextLet's kickstart the v6.8 release cycle.Signed-off-by: Maxime Ripard List of files: /linux/arch/sh/drivers/Makefile

5d2d4a9f603a47403395408f64b1261ca61f6d50 - Merge branch 'tip/perf/urgent'

Wed, 15 Nov 2023 10:15:40 +0100

Merge branch 'tip/perf/urgent'Avoid conflicts, base on fixes.Signed-off-by: Peter Zijlstra List of files: /linux/arch/sh/drivers/Makefile

5be9911406ada8fe6187db7ce402f7ff4c21ebdf - Merge tag 'sh-for-v6.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux

Fri, 03 Nov 2023 02:34:59 +0100

Merge tag 'sh-for-v6.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linuxPull sh updates from John Paul Adrian Glaubitz: "While the previously announced patch series for converting arch/sh to device trees is not yet ready for inclusion to mainline and therefore didn't make it for this pull request, there are still a small number changes for v6.7 which include one platform (board plus CPU and driver code) removal plus two fixes. The removal sent in by Arnd Bergmann concerns the microdev board which was an early SuperH prototype board that was never used in production. With the board removed, we were able to drop the now unused code for the SH4-202 CPU and well as the driver code for the superhyway bus and a custom implementation for ioport_map() and ioport_unmap() which will allow us to simplify ioport handling in the future. Another patch set by Geert Uytterhoeven revives SuperH BIOS earlyprintk support which got accidentally disabled in e76fe57447e88916 ("sh: Remove old early serial console code V2"), the second patch in the series updates the documentation. Finally, a patch by Masami Hiramatsu fixes a regression reported by the kernel test robot which uncovered that arch/sh is not implementing arch_cmpxchg_local() and therefore needs use __generic_cmpxchg_local() instead"* tag 'sh-for-v6.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux: locking/atomic: sh: Use generic_cmpxchg_local for arch_cmpxchg_local() Documentation: kernel-parameters: Add earlyprintk=bios on SH sh: bios: Revive earlyprintk support sh: machvec: Remove custom ioport_{un,}map() sh: Remove superhyway bus support sh: Remove unused SH4-202 support sh: Remove stale microdev board List of files: /linux/arch/sh/drivers/Makefile

8daaed76383aaae1d094d3d65d34890b2c6da24b - sh: Remove superhyway bus support

Thu, 14 Sep 2023 17:55:22 +0200

sh: Remove superhyway bus supportThe superhyway bus driver was only referenced on SH4-202, which is now gone,so remove it all as well.I could find no trace of anything ever calling superhyway_register_driver(),not in the git history but also not on the web, so I assume this has neverserved any purpose on mainline kernels.Signed-off-by: Arnd Bergmann Reviewed-by: John Paul Adrian Glaubitz Link: https://lore.kernel.org/r/20230914155523.3839811-3-arnd@kernel.orgSigned-off-by: John Paul Adrian Glaubitz List of files: /linux/arch/sh/drivers/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/sh/drivers/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/sh/drivers/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/sh/drivers/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/sh/drivers/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/sh/drivers/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/sh/drivers/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/arch/sh/drivers/Makefile

4f797f56c3786e2c6bc542b3f80e9a599b073976 - Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patches

Sun, 08 Dec 2019 14:37:10 +0100

Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patchesSigned-off-by: Ingo Molnar List of files: /linux/arch/sh/drivers/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/sh/drivers/Makefile