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/um/kernel/skas/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/um/kernel/skas/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/um/kernel/skas/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/um/kernel/skas/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/um/kernel/skas/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/um/kernel/skas/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/um/kernel/skas/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/um/kernel/skas/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/um/kernel/skas/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/um/kernel/skas/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/um/kernel/skas/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/um/kernel/skas/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/um/kernel/skas/Makefile

d3b08e5f3f2829943342b88d3e2b44fb0ccdccab - um: fix stub exe build with CONFIG_GCOV

Fri, 25 Oct 2024 10:27:01 +0200

um: fix stub exe build with CONFIG_GCOVCONFIG_GCOV is special and only in UML since it builds thekernel with a "userspace" option. This is fine, but the stubis even more special and not really a full userspace process,so it then fails to link as reported.Remove the GCOV options from the stub build.For good measure, also remove the GPROF options, even thoughthey don't seem to cause build failures now.To be able to do this, export the specific options (GCOV_OPTand GPROF_OPT) but rename them so there's less chance of anyconflicts.Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202410242238.SXhs2kQ4-lkp@intel.com/Fixes: 32e8eaf263d9 ("um: use execveat to create userspace MMs")Link: https://patch.msgid.link/20241025102700.9fbb9c34473f.I7f1537fe075638f8da64beb52ef6c9e5adc51bc3@changeidSigned-off-by: Johannes Berg List of files: /linux/arch/um/kernel/skas/Makefile

1e3071d629b2e2cd7faeb8de2f88ba31cfd7231a - um: Disable auto variable initialization for stub_exe.c

Wed, 16 Oct 2024 23:12:38 +0200

um: Disable auto variable initialization for stub_exe.cWhen automatic variable initialization is enabled viaCONFIG_INIT_STACK_ALL_{PATTERN,ZERO}, clang will insert a call tomemset() to initialize an object created with __builtin_alloca(). Thisultimately breaks the build when linking stub_exe because it is astandalone executable that does not include or link against memset(). ld: arch/um/kernel/skas/stub_exe.o: in function `_start': arch/um/kernel/skas/stub_exe.c:83:(.ltext+0x15): undefined reference to `memset'Disable automatic variable initialization for stub_exe.c by passing thedefault value of 'uninitialized' to '-ftrivial-auto-var-init', whichavoids generating the call to memset(). This code is small and runsquickly as it is just designed to set up an environment, so stackvariable initialization is unnecessary overhead for little gain.Fixes: 32e8eaf263d9 ("um: use execveat to create userspace MMs")Signed-off-by: Nathan Chancellor Link: https://patch.msgid.link/20241016-uml-fix-stub_exe-clang-v1-2-3d6381dc5a78@kernel.orgSigned-off-by: Johannes Berg List of files: /linux/arch/um/kernel/skas/Makefile

89350defd1f0eb5a58a7e1155d9e322080f0bf15 - um: Fix passing '-n' to linker for stub_exe

Wed, 16 Oct 2024 23:12:37 +0200

um: Fix passing '-n' to linker for stub_exeWhen building stub_exe with clang, there is an error because '-n' is nota recognized flag by the clang driver (which is being used to invoke thelinker): clang: error: unknown argument: '-n''-n' should be passed along to the linker, as it is the short flag for'--nmagic', so prefix it with '-Wl,'.Fixes: 32e8eaf263d9 ("um: use execveat to create userspace MMs")Signed-off-by: Nathan Chancellor Link: https://patch.msgid.link/20241016-uml-fix-stub_exe-clang-v1-1-3d6381dc5a78@kernel.orgSigned-off-by: Johannes Berg List of files: /linux/arch/um/kernel/skas/Makefile

32e8eaf263d9be014ba1970444f745682fa9c6c0 - um: use execveat to create userspace MMs

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

um: use execveat to create userspace MMsUsing clone will not undo features that have been enabled by libc. Anexample of this already happening is rseq, which could cause the kernelto read/write memory of the userspace process. In the future thestandard library might also use mseal by default to protect itself,which would also thwart our attempts at unmapping everything.Solve all this by taking a step back and doing an execve into a tinystatic binary that sets up the minimal environment required for thestub without using any standard library. That way we have a cleanexecution environment that is fully under the control of UML.Note that this changes things a bit as the FDs are not anymore sharedwith the kernel. Instead, we explicitly share the FDs for the physicalmemory and all existing iomem regions. Doing this is fine, as iomemregions cannot be added at runtime.Signed-off-by: Benjamin Berg Link: https://patch.msgid.link/20240919124511.282088-3-benjamin@sipsolutions.net[use pipe() instead of pipe2(), remove unneeded close() calls]Signed-off-by: Johannes Berg List of files: /linux/arch/um/kernel/skas/Makefile

36ec807b627b4c0a0a382f0ae48eac7187d14b2b - Merge branch 'next' into for-linus

Fri, 20 Sep 2024 10:24:24 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.12 merge window. List of files: /linux/arch/um/kernel/skas/Makefile

f057b57270c2a17d3f45c177e9434fa5745caa48 - Merge branch 'ib/6.11-rc6-matrix-keypad-spitz' into next

Fri, 06 Sep 2024 06:49:07 +0200

Merge branch 'ib/6.11-rc6-matrix-keypad-spitz' into nextBring in changes removing support for platform data from matrix-keypaddriver. List of files: /linux/arch/um/kernel/skas/Makefile

66e72a01b60ae6950ddbb3585fdc1424d303e14b - Merge tag 'v6.11-rc1' into clk-meson-next

Mon, 29 Jul 2024 16:32:02 +0200

Merge tag 'v6.11-rc1' into clk-meson-nextLinux 6.11-rc1 List of files: /linux/arch/um/kernel/skas/Makefile