Changes in .gitignore

4f2c0a4acffbec01079c28f839422e64ddeff004 - Merge branch 'main' into zstd-linus

Wed, 14 Dec 2022 01:21:55 +0100

Merge branch 'main' into zstd-linus List of files: /linux/init/.gitignore

cfd1f6c16f7deadfe5269a76c1516405c4466481 - Merge branch 'for-6.2/apple' into for-linus

Tue, 13 Dec 2022 14:27:16 +0100

Merge branch 'for-6.2/apple' into for-linus- new quirks for select Apple keyboards (Kerem Karabay, Aditya Garg) List of files: /linux/init/.gitignore

e291c116f60f3c1ca98090f0f8e7c77e658562fb - Merge branch 'next' into for-linus

Mon, 12 Dec 2022 19:47:03 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.2 merge window. List of files: /linux/init/.gitignore

6b2b0d839acaa84f05a77184370f793752e786e9 - Merge branch 'rework/console-list-lock' into for-linus

Thu, 08 Dec 2022 11:46:56 +0100

Merge branch 'rework/console-list-lock' into for-linus List of files: /linux/init/.gitignore

29583dfcd2dd72c766422bd05c16f06c6b1fb356 - Merge drm/drm-next into drm-misc-next-fixes

Mon, 21 Nov 2022 09:03:13 +0100

Merge drm/drm-next into drm-misc-next-fixesBackmerging to update drm-misc-next-fixes for the final phaseof the release cycle.Signed-off-by: Thomas Zimmermann List of files: /linux/init/.gitignore

002c6ca75289a4ac4f6738213dd2d258704886e4 - Merge drm/drm-next into drm-intel-next

Mon, 14 Nov 2022 20:32:34 +0100

Merge drm/drm-next into drm-intel-nextCatch up on 6.1-rc cycle in order to solve the intel_backlightconflict on linux-next.Signed-off-by: Rodrigo Vivi List of files: /linux/init/.gitignore

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

Fri, 04 Nov 2022 10:11:30 +0100

Merge drm/drm-next into drm-intel-gt-nextNeeded to bring in v6.1-rc1 which contains commit f683b9d61319 ("i915: use the VMA iterator")which is needed for series https://patchwork.freedesktop.org/series/110083/ .Signed-off-by: Joonas Lahtinen List of files: /linux/init/.gitignore

14e77332e74603efab8347c89d3cda447c3b97c9 - Merge branch 'main' into zstd-next

Sat, 22 Oct 2022 01:00:35 +0200

Merge branch 'main' into zstd-next List of files: /linux/init/.gitignore

1aca5ce036e3499336d1a2ace3070f908381c055 - Merge drm/drm-fixes into drm-misc-fixes

Thu, 20 Oct 2022 09:09:00 +0200

Merge drm/drm-fixes into drm-misc-fixesBackmerging to get v6.1-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/init/.gitignore

008f05a72d32dcc14038801649ec67af765fcc3c - ASoC: jz4752b: Capture fixes

Wed, 19 Oct 2022 17:37:01 +0200

ASoC: jz4752b: Capture fixesMerge series from Siarhei Volkau :The patchset fixes: - Line In path stays powered off during capturing or bypass to mixer. - incorrectly represented dB values in alsamixer, et al. - incorrect represented Capture input selector in alsamixer in Playback tab. - wrong control selected as Capture Master List of files: /linux/init/.gitignore

a140a6a2d5ec0329ad05cd3532a91ad0ce58dceb - Merge drm/drm-next into drm-misc-next

Tue, 18 Oct 2022 15:00:03 +0200

Merge drm/drm-next into drm-misc-nextLet's kick-off this release cycle.Signed-off-by: Maxime Ripard List of files: /linux/init/.gitignore

c29a017f9df34d190fbc7917d30dbefce7d9dc1f - Merge tag 'v6.1-rc1' into next

Mon, 17 Oct 2022 11:36:32 +0200

Merge tag 'v6.1-rc1' into nextMerge with mainline to bring in the latest changes to twl4030 driver. List of files: /linux/init/.gitignore

8048b8358031ae742c1c8f16f196f6d8070bb09f - Merge branch 'master' into mm-hotfixes-stable

Mon, 17 Oct 2022 01:09:11 +0200

Merge branch 'master' into mm-hotfixes-stable List of files: /linux/init/.gitignore

8afc66e8d43be8edcf442165b70d50dd33091e68 - Merge tag 'kbuild-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Mon, 10 Oct 2022 21:00:45 +0200

Merge tag 'kbuild-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuildPull Kbuild updates from Masahiro Yamada: - Remove potentially incomplete targets when Kbuid is interrupted by SIGINT etc in case GNU Make may miss to do that when stderr is piped to another program. - Rewrite the single target build so it works more correctly. - Fix rpm-pkg builds with V=1. - List top-level subdirectories in ./Kbuild. - Ignore auto-generated __kstrtab_* and __kstrtabns_* symbols in kallsyms. - Avoid two different modules in lib/zstd/ having shared code, which potentially causes building the common code as build-in and modular back-and-forth. - Unify two modpost invocations to optimize the build process. - Remove head-y syntax in favor of linker scripts for placing particular sections in the head of vmlinux. - Bump the minimal GNU Make version to 3.82. - Clean up misc Makefiles and scripts.* tag 'kbuild-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (41 commits) docs: bump minimal GNU Make version to 3.82 ia64: simplify esi object addition in Makefile Revert "kbuild: Check if linker supports the -X option" kbuild: rebuild .vmlinux.export.o when its prerequisite is updated kbuild: move modules.builtin(.modinfo) rules to Makefile.vmlinux_o zstd: Fixing mixed module-builtin objects kallsyms: ignore __kstrtab_* and __kstrtabns_* symbols kallsyms: take the input file instead of reading stdin kallsyms: drop duplicated ignore patterns from kallsyms.c kbuild: reuse mksysmap output for kallsyms mksysmap: update comment about __crc_* kbuild: remove head-y syntax kbuild: use obj-y instead extra-y for objects placed at the head kbuild: hide error checker logs for V=1 builds kbuild: re-run modpost when it is updated kbuild: unify two modpost invocations kbuild: move vmlinux.o rule to the top Makefile kbuild: move .vmlinux.objs rule to Makefile.modpost kbuild: list sub-directories in ./Kbuild Makefile.compiler: replace cc-ifversion with compiler-specific macros ... List of files: /linux/init/.gitignore

2df8220cc511326508ec4da2f43ef69311bdd7b9 - kbuild: build init/built-in.a just once

Sun, 28 Aug 2022 04:39:53 +0200

kbuild: build init/built-in.a just onceKbuild builds init/built-in.a twice; first during the ordinarydirectory descending, second from scripts/link-vmlinux.sh.We do this because UTS_VERSION contains the build version and thetimestamp. We cannot update it during the normal directory traversalsince we do not yet know if we need to update vmlinux. UTS_VERSION istemporarily calculated, but omitted from the update check. Otherwise,vmlinux would be rebuilt every time.When Kbuild results in running link-vmlinux.sh, it increments theversion number in the .version file and takes the timestamp at thattime to really fix UTS_VERSION.However, updating the same file twice is a footgun. To avoid nastytimestamp issues, all build artifacts that depend on init/built-in.aare atomically generated in link-vmlinux.sh, where some of them do notneed rebuilding.To fix this issue, this commit changes as follows:[1] Split UTS_VERSION out to include/generated/utsversion.h from include/generated/compile.h include/generated/utsversion.h is generated just before the vmlinux link. It is generated under include/generated/ because some decompressors (s390, x86) use UTS_VERSION.[2] Split init_uts_ns and linux_banner out to init/version-timestamp.c from init/version.c init_uts_ns and linux_banner contain UTS_VERSION. During the ordinary directory descending, they are compiled with __weak and used to determine if vmlinux needs relinking. Just before the vmlinux link, they are compiled without __weak to embed the real version and timestamp.Signed-off-by: Masahiro Yamada List of files: /linux/init/.gitignore