Changes in Makefile

9a87ffc99ec8eb8d35eed7c4f816d75f5cc9662e - Merge branch 'next' into for-linus

Tue, 02 May 2023 00:20:08 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.4 merge window. List of files: /linux/arch/arm/mach-omap1/Makefile

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

Tue, 11 Apr 2023 14:43:45 +0200

Merge drm/drm-next into drm-intel-gt-nextNeed to pull in commit from drm-next (earlier in drm-intel-next):1eca0778f4b3 ("drm/i915: add struct i915_dsm to wrap dsm members together")In order to merge following patch to drm-intel-gt-next:https://patchwork.freedesktop.org/patch/530942/?series=114925&rev=6Signed-off-by: Joonas Lahtinen List of files: /linux/arch/arm/mach-omap1/Makefile

cecdd52a3dd312564f81a39df08378b7b39a2654 - Merge drm/drm-next into drm-intel-next

Tue, 28 Mar 2023 16:30:57 +0200

Merge drm/drm-next into drm-intel-nextCatch up with 6.3-rc cycle...Signed-off-by: Rodrigo Vivi List of files: /linux/arch/arm/mach-omap1/Makefile

e752ab11dcb48353727ea26eefd740155e028865 - Merge remote-tracking branch 'drm/drm-next' into msm-next

Mon, 20 Mar 2023 18:31:25 +0100

Merge remote-tracking branch 'drm/drm-next' into msm-nextMerge drm-next into msm-next to pick up external clk and PM dependenciesfor improved a6xx GPU reset sequence.Signed-off-by: Rob Clark List of files: /linux/arch/arm/mach-omap1/Makefile

d26a3a6ce7e02f9c056ad992bcd9624735022337 - Merge tag 'v6.3-rc2' into next

Fri, 17 Mar 2023 12:01:30 +0100

Merge tag 'v6.3-rc2' into nextMerge with mainline to get of_property_present() and other newer APIs. List of files: /linux/arch/arm/mach-omap1/Makefile

b3c9a04135bdbd3aabd5e9534bad0fe6df505f8a - Merge drm/drm-fixes into drm-misc-fixes

Mon, 13 Mar 2023 10:14:05 +0100

Merge drm/drm-fixes into drm-misc-fixesBackmerging to get latest upstream.Signed-off-by: Thomas Zimmermann List of files: /linux/arch/arm/mach-omap1/Makefile

a1eccc574f977bd21a4ec8ac54bd73a2756bd281 - Merge drm/drm-next into drm-misc-next

Mon, 13 Mar 2023 09:27:50 +0100

Merge drm/drm-next into drm-misc-nextBackmerging to get v6.3-rc1 and sync with the other DRM trees.Signed-off-by: Thomas Zimmermann List of files: /linux/arch/arm/mach-omap1/Makefile

b8fa3e3833c14151a47ebebbc5427dcfe94bb407 - Merge remote-tracking branch 'acme/perf-tools' into perf-tools-next

Fri, 10 Mar 2023 22:43:17 +0100

Merge remote-tracking branch 'acme/perf-tools' into perf-tools-nextTo pick up perf-tools fixes just merged upstream.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/arch/arm/mach-omap1/Makefile

26ed1d29fc44f3f2f0c396c1392abefac5f0454e - Merge branch 'for-next' into for-linus

Fri, 03 Mar 2023 14:20:56 +0100

Merge branch 'for-next' into for-linus List of files: /linux/arch/arm/mach-omap1/Makefile

585a78c1f77be305b1f6adad392f16047fb66ffd - Merge branch 'linus' into objtool/core, to pick up Xen dependencies

Thu, 23 Feb 2023 09:16:39 +0100

Merge branch 'linus' into objtool/core, to pick up Xen dependenciesPick up dependencies - freshly merged upstream via xen-next - before applyingdependent objtool changes.Signed-off-by: Ingo Molnar List of files: /linux/arch/arm/mach-omap1/Makefile

939204e4df962982cbc84acc26b29b421dd530a8 - Merge tag 'v6.2' into iommufd.git for-next

Tue, 21 Feb 2023 16:11:03 +0100

Merge tag 'v6.2' into iommufd.git for-nextResolve conflicts from the signature change in iommu_map: - drivers/infiniband/hw/usnic/usnic_uiom.c Switch iommu_map_atomic() to iommu_map(.., GFP_ATOMIC) - drivers/vfio/vfio_iommu_type1.c Following indenting change for GFP_KERNELSigned-off-by: Jason Gunthorpe List of files: /linux/arch/arm/mach-omap1/Makefile

ff0c7e18629b8bd64681313a88ce55e182c9fee6 - Merge tag 'arm-boardfile-remove-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Tue, 21 Feb 2023 00:28:57 +0100

Merge tag 'arm-boardfile-remove-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/socPull ARM SoC boardfile updates from Arnd Bergmann "Unused boardfile removal for 6.3 This is a follow-up to the deprecation of most of the old-style board files that was merged in linux-6.0, removing them for good. This branch is almost exclusively dead code removal based on those annotations. Some device driver removals went through separate subsystem trees, but the majority is in the same branch, in order to better handle dependencies between the patches and avoid breaking bisection. Unfortunately that leads to merge conflicts against other changes in the subsystem trees, but they should all be trivial to resolve by removing the files. See commit 7d0d3fa7339e ("Merge tag 'arm-boardfiles-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc") for the description of which machines were marked unused and are now removed. The only removals that got postponed are Terastation WXL (mv78xx0) and Jornada720 (StrongARM1100), which turned out to still have potential users"* tag 'arm-boardfile-remove-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (91 commits) mmc: omap: drop TPS65010 dependency ARM: pxa: restore mfp-pxa320.h usb: ohci-omap: avoid unused-variable warning ARM: debug: remove references in DEBUG_UART_8250_SHIFT to removed configs ARM: s3c: remove obsolete s3c-cpu-freq header MAINTAINERS: adjust SAMSUNG SOC CLOCK DRIVERS after s3c24xx support removal MAINTAINERS: update file entries after arm multi-platform rework and mach-pxa removal ARM: remove CONFIG_UNUSED_BOARD_FILES mfd: remove htc-pasic3 driver w1: remove ds1wm driver usb: remove ohci-tmio driver fbdev: remove w100fb driver fbdev: remove tmiofb driver mmc: remove tmio_mmc driver mfd: remove ucb1400 support mfd: remove toshiba tmio drivers rtc: remove v3020 driver power: remove pda_power supply driver ASoC: pxa: remove unused board support pcmcia: remove unused pxa/sa1100 drivers ... List of files: /linux/arch/arm/mach-omap1/Makefile

5661706efa200252d0e9fea02421b0a5857808c3 - Merge branch 'topic/apple-gmux' into for-next

Thu, 16 Feb 2023 14:18:54 +0100

Merge branch 'topic/apple-gmux' into for-nextPull vga_switcheroo fix for MacsSigned-off-by: Takashi Iwai List of files: /linux/arch/arm/mach-omap1/Makefile

33436335e93a1788a58443fc99c5ab320ce4b9d9 - Merge tag 'kvm-riscv-6.3-1' of https://github.com/kvm-riscv/linux into HEAD

Wed, 15 Feb 2023 18:33:28 +0100

Merge tag 'kvm-riscv-6.3-1' of https://github.com/kvm-riscv/linux into HEADKVM/riscv changes for 6.3- Fix wrong usage of PGDIR_SIZE to check page sizes- Fix privilege mode setting in kvm_riscv_vcpu_trap_redirect()- Redirect illegal instruction traps to guest- SBI PMU support for guest List of files: /linux/arch/arm/mach-omap1/Makefile

94817983fb2ccd1869ed0c5a763317a45283a272 - Merge tag 'v6.2-rc7' into media_tree

Wed, 08 Feb 2023 15:18:54 +0100

Merge tag 'v6.2-rc7' into media_treeLinux 6.2-rc7* tag 'v6.2-rc7': (1549 commits) Linux 6.2-rc7 fbcon: Check font dimension limits efi: fix potential NULL deref in efi_mem_reserve_persistent kernel/irq/irqdomain.c: fix memory leak with using debugfs_lookup() HV: hv_balloon: fix memory leak with using debugfs_lookup() mtk_sgmii: enable PCS polling to allow SFP work net: mediatek: sgmii: fix duplex configuration net: mediatek: sgmii: ensure the SGMII PHY is powered down on configuration MAINTAINERS: update SCTP maintainers MAINTAINERS: ipv6: retire Hideaki Yoshifuji mailmap: add John Crispin's entry MAINTAINERS: bonding: move Veaceslav Falico to CREDITS net: openvswitch: fix flow memory leak in ovs_flow_cmd_new net: ethernet: mtk_eth_soc: disable hardware DSA untagging for second MAC virtio-net: Keep stop() to follow mirror sequence of open() efi: Accept version 2 of memory attributes table ceph: blocklist the kclient when receiving corrupted snap trace ceph: move mount state enum to super.h selftests: net: udpgso_bench_tx: Cater for pending datagrams zerocopy benchmarking selftests: net: udpgso_bench: Fix racing bug between the rx/tx programs ... List of files: /linux/arch/arm/mach-omap1/Makefile

57a30218fa25c469ed507964bbf028b7a064309a - Merge tag 'v6.2-rc6' into sched/core, to pick up fixes

Tue, 31 Jan 2023 15:01:20 +0100

Merge tag 'v6.2-rc6' into sched/core, to pick up fixesPick up fixes before merging another batch of cpuidle updates.Signed-off-by: Ingo Molnar List of files: /linux/arch/arm/mach-omap1/Makefile

df5bf3b942a8d344bd9cbbe6ac31c9a2ea1557a4 - Merge drm/drm-next into drm-misc-next

Tue, 31 Jan 2023 14:18:33 +0100

Merge drm/drm-next into drm-misc-nextBackmerging to get v6.2-rc6.Signed-off-by: Thomas Zimmermann List of files: /linux/arch/arm/mach-omap1/Makefile

aebd8f0c6f8280ba35bc989f4a9ea47469d3589a - Merge v6.2-rc6 into drm-next

Tue, 31 Jan 2023 11:22:15 +0100

Merge v6.2-rc6 into drm-nextDue to holidays we started -next with more -fixes in-flight thanusual, and people have been asking where they are. Backmerge to getthings better in sync.Conflicts:- Tiny conflict in drm_fbdev_generic.c between variable rename and missing error handling that got added.- Conflict in drm_fb_helper.c between the added call to vgaswitcheroo in drm_fb_helper_single_fb_probe and a refactor patch that extracted lots of helpers and incidentally removed the dev local variable. Readd it to make things compile.Signed-off-by: Daniel Vetter List of files: /linux/arch/arm/mach-omap1/Makefile

6397859c8e9d87190f49dabbb835114ad0ea9fcb - Merge tag 'v6.2-rc5' into locking/core, to pick up fixes

Thu, 26 Jan 2023 11:42:56 +0100

Merge tag 'v6.2-rc5' into locking/core, to pick up fixesRefresh this branch with the latest locking fixes, beforeapplying a new series of changes.Signed-off-by: Ingo Molnar List of files: /linux/arch/arm/mach-omap1/Makefile

e3e9fc7fa7ad221cc2e7b207d514cc84ed393251 - Merge 6.2-rc5 into usb-next

Mon, 23 Jan 2023 15:38:08 +0100

Merge 6.2-rc5 into usb-nextWe need the USB fixes in here and this resolves merge conflicts asreported in linux-next in the following files: drivers/usb/host/xhci.c drivers/usb/host/xhci.h drivers/usb/typec/ucsi/ucsi.cReported-by: Stephen Rothwell Signed-off-by: Greg Kroah-Hartman List of files: /linux/arch/arm/mach-omap1/Makefile