Changes in Makefile

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

Wed, 05 Feb 2025 10:29:14 +0100

Merge drm/drm-next into drm-intel-gt-nextWe need4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")in order to land a i915 PMU simplification and a fix. That landed in 6.12and we are stuck at 6.9 so lets bump things forward.Signed-off-by: Tvrtko Ursulin List of files: /linux/arch/x86/um/os-Linux/Makefile

60675d4ca1ef0857e44eba5849b74a3a998d0c0f - Merge branch 'linus' into x86/mm, to pick up fixes

Fri, 20 Dec 2024 10:25:44 +0100

Merge branch 'linus' into x86/mm, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/arch/x86/um/os-Linux/Makefile

25768de50b1f2dbb6ea44bd5148a87fe2c9c3688 - Merge branch 'next' into for-linus

Tue, 21 Jan 2025 06:37:39 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.14 merge window. List of files: /linux/arch/x86/um/os-Linux/Makefile

670af65d2ab4a6a9bb72f014b080757e291ad3fe - Merge branch 'for-6.14/constify-bin-attribute' into for-linus

Mon, 20 Jan 2025 09:58:12 +0100

Merge branch 'for-6.14/constify-bin-attribute' into for-linus- constification of 'struct bin_attribute' in various HID driver (Thomas Weißschuh) List of files: /linux/arch/x86/um/os-Linux/Makefile

6d4a0f4ea72319c9a37c1a7191695467006dd272 - Merge tag 'v6.13-rc3' into next

Tue, 17 Dec 2024 18:40:45 +0100

Merge tag 'v6.13-rc3' into nextSync up with the mainline. List of files: /linux/arch/x86/um/os-Linux/Makefile

302cc446cbd92aadff72a647cebc13d5634f8342 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Thu, 05 Dec 2024 20:48:58 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR (net-6.13-rc2).No conflicts or adjacent changes.Signed-off-by: Jakub Kicinski List of files: /linux/arch/x86/um/os-Linux/Makefile

c5fb51b71788926feef0d07f30c8af1d5e4af1a6 - Merge remote-tracking branch 'pm/opp/linux-next' into HEAD

Fri, 03 Jan 2025 16:13:45 +0100

Merge remote-tracking branch 'pm/opp/linux-next' into HEADMerge pm/opp tree to get dev_pm_opp_get_bw()Signed-off-by: Rob Clark List of files: /linux/arch/x86/um/os-Linux/Makefile

e7f0a3a6f7339af55f1ca2c27131739d75569c08 - Merge drm/drm-next into drm-intel-next

Wed, 11 Dec 2024 21:06:05 +0100

Merge drm/drm-next into drm-intel-nextCatching up with 6.13-rc2.Signed-off-by: Rodrigo Vivi List of files: /linux/arch/x86/um/os-Linux/Makefile

8f109f287fdc7b8fc7dcb6b2190c8b17dc22fcda - Merge drm/drm-next into drm-xe-next

Mon, 02 Dec 2024 17:22:11 +0100

Merge drm/drm-next into drm-xe-nextA backmerge to get the PMT preparation work formerging the BMG PMT support.Signed-off-by: Rodrigo Vivi List of files: /linux/arch/x86/um/os-Linux/Makefile

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

Mon, 02 Dec 2024 12:44:18 +0100

Merge drm/drm-next into drm-misc-nextKickstart 6.14 cycle.Signed-off-by: Maxime Ripard List of files: /linux/arch/x86/um/os-Linux/Makefile

bcfd5f644c5b933cfb3c488220e40a03e011e8a4 - Merge tag 'v6.13-rc1' into perf/core, to refresh the branch

Mon, 02 Dec 2024 11:52:59 +0100

Merge tag 'v6.13-rc1' into perf/core, to refresh the branchSigned-off-by: Ingo Molnar List of files: /linux/arch/x86/um/os-Linux/Makefile

c34e9ab9a612ee8b18273398ef75c207b01f516d - Merge tag 'asoc-fix-v6.13-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Thu, 05 Dec 2024 18:09:29 +0100

Merge tag 'asoc-fix-v6.13-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v6.13A few small fixes for v6.13, all system specific - the biggest thing isthe fix for jack handling over suspend on some Intel laptops. List of files: /linux/arch/x86/um/os-Linux/Makefile

831c1926ee728c3e747255f7c0f434762e8e863d - Merge tag 'uml-for-linus-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux

Sat, 30 Nov 2024 19:34:54 +0100

Merge tag 'uml-for-linus-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linuxPull UML updates from Richard Weinberger: - Lots of cleanups, mostly from Benjamin Berg and Tiwei Bie - Removal of unused code - Fix for sparse warnings - Cleanup around stub_exe()* tag 'uml-for-linus-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux: (68 commits) hostfs: Fix the NULL vs IS_ERR() bug for __filemap_get_folio() um: move thread info into task um: Always dump trace for specified task in show_stack um: vector: Do not use drvdata in release um: net: Do not use drvdata in release um: ubd: Do not use drvdata in release um: ubd: Initialize ubd's disk pointer in ubd_add um: virtio_uml: query the number of vqs if supported um: virtio_uml: fix call_fd IRQ allocation um: virtio_uml: send SET_MEM_TABLE message with the exact size um: remove broken double fault detection um: remove duplicate UM_NSEC_PER_SEC definition um: remove file sync for stub data um: always include kconfig.h and compiler-version.h um: set DONTDUMP and DONTFORK flags on KASAN shadow memory um: fix sparse warnings in signal code um: fix sparse warnings from regset refactor um: Remove double zero check um: fix stub exe build with CONFIG_GCOV um: Use os_set_pdeathsig helper in winch thread/process ... List of files: /linux/arch/x86/um/os-Linux/Makefile

68b9883cc16ec2ce699d832ef60241b1a4e47d33 - um: Discover host_task_size from envp

Thu, 19 Sep 2024 14:45:09 +0200

um: Discover host_task_size from envpWhen loading the UML binary, the host kernel will place the stack at thehighest possible address. It will then map the program name andenvironment variables onto the start of the stack.As such, an easy way to figure out the host_task_size is to use thehighest pointer to an environment variable as a reference.Ensure that this works by disabling address layout randomization andre-executing UML in case it was enabled.This increases the available TASK_SIZE for 64 bit UML considerably.Signed-off-by: Benjamin Berg Link: https://patch.msgid.link/20240919124511.282088-9-benjamin@sipsolutions.netSigned-off-by: Johannes Berg List of files: /linux/arch/x86/um/os-Linux/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/x86/um/os-Linux/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/x86/um/os-Linux/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/x86/um/os-Linux/Makefile

06d07429858317ded2db7986113a9e0129cd599b - Merge drm/drm-next into drm-intel-next

Thu, 29 Feb 2024 10:57:56 +0100

Merge drm/drm-next into drm-intel-nextSync to get the drm_printer changes to drm-intel-next.Signed-off-by: Jani Nikula List of files: /linux/arch/x86/um/os-Linux/Makefile

2e21dee6a46a66e4c2ced778485e1044101edee4 - Merge branch 'for-6.9/amd-sfh' into for-linus

Wed, 13 Mar 2024 21:17:33 +0100

Merge branch 'for-6.9/amd-sfh' into for-linus- assorted fixes and optimizations for amd-sfh (Basavaraj Natikar)Signed-off-by: Jiri Kosina List of files: /linux/arch/x86/um/os-Linux/Makefile

41c177cf354126a22443b5c80cec9fdd313e67e1 - Merge tag 'drm-misc-next-2024-02-08' into msm-next

Sun, 11 Feb 2024 21:34:07 +0100

Merge tag 'drm-misc-next-2024-02-08' into msm-nextMerge the drm-misc tree to uprev MSM CI.Signed-off-by: Rob Clark List of files: /linux/arch/x86/um/os-Linux/Makefile