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

cdc780f044a803aff8845b949f800f0f3d095d5f - Merge branch 'for-6.4/amd-sfh' into for-linus

Wed, 26 Apr 2023 22:52:34 +0200

Merge branch 'for-6.4/amd-sfh' into for-linus- assorted functional fixes for amd-sfh driver (Basavaraj Natikar) List of files: /linux/arch/um/os-Linux/skas/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/um/os-Linux/skas/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/um/os-Linux/skas/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/um/os-Linux/skas/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/um/os-Linux/skas/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/um/os-Linux/skas/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/um/os-Linux/skas/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/um/os-Linux/skas/Makefile

498a1cf902c31c3af398082d65cf150b33b367e6 - Merge tag 'kbuild-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Sun, 26 Feb 2023 20:53:25 +0100

Merge tag 'kbuild-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuildPull Kbuild updates from Masahiro Yamada: - Change V=1 option to print both short log and full command log - Allow V=1 and V=2 to be combined as V=12 - Make W=1 detect wrong .gitignore files - Tree-wide cleanups for unused command line arguments passed to Clang - Stop using -Qunused-arguments with Clang - Make scripts/setlocalversion handle only correct release tags instead of any arbitrary annotated tag - Create Debian and RPM source packages without cleaning the source tree - Various cleanups for packaging* tag 'kbuild-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (74 commits) kbuild: rpm-pkg: remove unneeded KERNELRELEASE from modules/headers_install docs: kbuild: remove description of KBUILD_LDS_MODULE .gitattributes: use 'dts' diff driver for *.dtso files kbuild: deb-pkg: improve the usability of source package kbuild: deb-pkg: fix binary-arch and clean in debian/rules kbuild: tar-pkg: use tar rules in scripts/Makefile.package kbuild: make perf-tar*-src-pkg work without relying on git kbuild: deb-pkg: switch over to source format 3.0 (quilt) kbuild: deb-pkg: make .orig tarball a hard link if possible kbuild: deb-pkg: hide KDEB_SOURCENAME from Makefile kbuild: srcrpm-pkg: create source package without cleaning kbuild: rpm-pkg: build binary packages from source rpm kbuild: deb-pkg: create source package without cleaning kbuild: add a tool to list files ignored by git Documentation/llvm: add Chimera Linux, Google and Meta datacenters setlocalversion: use only the correct release tag for git-describe setlocalversion: clean up the construction of version output .gitignore: ignore *.cover and *.mbx kbuild: remove --include-dir MAKEFLAG from top Makefile kbuild: fix trivial typo in comment ... List of files: /linux/arch/um/os-Linux/skas/Makefile

67d7c3023a672c2b73d19d6d23684df670fce648 - kbuild: remove --include-dir MAKEFLAG from top Makefile

Sat, 28 Jan 2023 10:24:23 +0100

kbuild: remove --include-dir MAKEFLAG from top MakefileI added $(srctree)/ to some included Makefiles in the following commits: - 3204a7fb98a3 ("kbuild: prefix $(srctree)/ to some included Makefiles") - d82856395505 ("kbuild: do not require sub-make for separate output tree builds")They were a preparation for removing --include-dir flag.I have never thought --include-dir useful. Rather, it _is_ harmful.For example, run the following commands: $ make -s ARCH=x86 mrproper defconfig $ make ARCH=arm O=foo dtbs make[1]: Entering directory '/tmp/linux/foo' HOSTCC scripts/basic/fixdep Error: kernelrelease not valid - run 'make prepare' to update it UPD include/config/kernel.release make[1]: Leaving directory '/tmp/linux/foo'The first command configures the source tree for x86. The next commandtries to build ARM device trees in the separate foo/ directory - thismust stop because the directory foo/ has not been configured yet.However, due to --include-dir=$(abs_srctree), the top Makefile includesthe wrong include/config/auto.conf from the source tree and continuesbuilding. Kbuild traverses the directory tree, but of course it doesnot work correctly. The Error message is also pointless - 'make prepare'does not help at all for fixing the issue.This commit fixes more arch Makefile, and finally removes --include-dirfrom the top Makefile.There are more breakages under drivers/, but I do not volunteer to fixthem all. I just moved --include-dir to drivers/Makefile.With this commit, the second command will stop with a sensible message. $ make -s ARCH=x86 mrproper defconfig $ make ARCH=arm O=foo dtbs make[1]: Entering directory '/tmp/linux/foo' SYNC include/config/auto.conf.cmd *** *** The source tree is not clean, please run 'make ARCH=arm mrproper' *** in /tmp/linux *** make[2]: *** [../Makefile:646: outputmakefile] Error 1 /tmp/linux/Makefile:770: include/config/auto.conf.cmd: No such file or directory make[1]: *** [/tmp/linux/Makefile:793: include/config/auto.conf.cmd] Error 2 make[1]: Leaving directory '/tmp/linux/foo' make: *** [Makefile:226: __sub-make] Error 2Signed-off-by: Masahiro Yamada List of files: /linux/arch/um/os-Linux/skas/Makefile

976e3645923bdd2fe7893aae33fd7a21098bfb28 - Merge branch 'next' into for-linus

Mon, 25 Nov 2019 22:26:56 +0100

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

9f4813b531a0b8cc502fcfb142937fe4e9104d77 - Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixes

Tue, 19 Nov 2019 09:00:45 +0100

Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/arch/um/os-Linux/skas/Makefile

ac94be498f84f7327533b62faca4c3da64434904 - Merge branch 'linus' into x86/hyperv

Fri, 15 Nov 2019 10:30:50 +0100

Merge branch 'linus' into x86/hypervPick up upstream fixes to avoid conflicts. List of files: /linux/arch/um/os-Linux/skas/Makefile

728d90bdc9e480dc93913e59a0aa3c896c7aa697 - Merge tag 'v5.4-rc5' into next

Sun, 27 Oct 2019 19:00:19 +0100

Merge tag 'v5.4-rc5' into nextSync up with mainline. List of files: /linux/arch/um/os-Linux/skas/Makefile

112d6212c80a1c560757520bd822a41c0ad15c2c - Merge tag 'v5.4-rc3' into spi-5.4

Fri, 18 Oct 2019 19:30:49 +0200

Merge tag 'v5.4-rc3' into spi-5.4Linux 5.4-rc3 List of files: /linux/arch/um/os-Linux/skas/Makefile

fa41d6ee904266fa8739cafa6ec038c3a8e435b7 - Merge drm/drm-next into drm-intel-next-queued

Tue, 15 Oct 2019 10:18:26 +0200

Merge drm/drm-next into drm-intel-next-queuedBackmerging to pull in HDR DP code:https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.htmlSigned-off-by: Joonas Lahtinen List of files: /linux/arch/um/os-Linux/skas/Makefile

1913c7f3fc2514e09262baf2267a82dfdb215c39 - Merge tag 'fix-missing-panels' into fixes

Fri, 04 Oct 2019 18:06:41 +0200

Merge tag 'fix-missing-panels' into fixes List of files: /linux/arch/um/os-Linux/skas/Makefile

4092de1ba34eb376791809fb366bc15f8a9e0b7c - Merge drm/drm-next into drm-misc-next

Thu, 03 Oct 2019 16:38:50 +0200

Merge drm/drm-next into drm-misc-nextWe haven't done any backmerge for a while due to the merge window, and itstarts to become an issue for komeda. Let's bring 5.4-rc1 in.Signed-off-by: Maxime Ripard List of files: /linux/arch/um/os-Linux/skas/Makefile

77fdaa091d79c87323a9f3912a25f73e02ea2a01 - Merge drm/drm-fixes into drm-misc-fixes

Thu, 03 Oct 2019 09:59:29 +0200

Merge drm/drm-fixes into drm-misc-fixesWe haven't backmerged for a while, let's start the -rc period by pullingrc1.Signed-off-by: Maxime Ripard List of files: /linux/arch/um/os-Linux/skas/Makefile