Changes in .gitignore

03ab8e6297acd1bc0eedaa050e2a1635c576fd11 - Merge tag 'v5.18'

Tue, 31 May 2022 15:13:23 +0200

Merge tag 'v5.18'Linux 5.18 List of files: /linux/arch/um/.gitignore

de4fb176622d54a82ea3ceb7362392aaf5ff0b5a - Merge branches 'fixes' and 'misc' into for-linus

Fri, 01 Apr 2022 17:12:31 +0200

Merge branches 'fixes' and 'misc' into for-linus List of files: /linux/arch/um/.gitignore

b690490d6d466972ade172ee2e7f6ffa49e7e910 - Merge branch 'for-5.18/amd-sfh' into for-linus

Wed, 23 Mar 2022 09:58:40 +0100

Merge branch 'for-5.18/amd-sfh' into for-linus- dead code elimination (Christophe JAILLET) List of files: /linux/arch/um/.gitignore

1136fa0c07de570dc17858745af8be169d1440ba - Merge tag 'v5.17-rc4' into for-linus

Tue, 01 Mar 2022 08:12:55 +0100

Merge tag 'v5.17-rc4' into for-linusMerge with mainline to get the Intel ASoC generic helpers header andother changes. List of files: /linux/arch/um/.gitignore

986c6f7c3fc855032f3457a5a1b7fbcc09c375bb - Merge tag 'v5.17-rc4' into next

Fri, 18 Feb 2022 22:30:38 +0100

Merge tag 'v5.17-rc4' into nextSync up with mainline to get the latest changes in HID subsystem. List of files: /linux/arch/um/.gitignore

542898c5aa5c6a3179dffb1d1606884a63f75fed - Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

Mon, 07 Feb 2022 17:01:37 +0100

Merge remote-tracking branch 'drm/drm-next' into drm-misc-nextFirst backmerge into drm-misc-next. Required for more helpers backmerged,and to pull in 5.17 (rc2).Signed-off-by: Maarten Lankhorst List of files: /linux/arch/um/.gitignore

7e6a6b400db8048bd1c06e497e338388413cf5bc - Merge tag 'kvmarm-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

Sat, 05 Feb 2022 06:58:25 +0100

Merge tag 'kvmarm-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEADKVM/arm64 fixes for 5.17, take #2- A couple of fixes when handling an exception while a SError has been delivered- Workaround for Cortex-A510's single-step[ erratum List of files: /linux/arch/um/.gitignore

876f7a438e4247a948268ad77b67c494f709cc30 - Merge drm/drm-next into drm-intel-gt-next

Thu, 03 Feb 2022 08:53:49 +0100

Merge drm/drm-next into drm-intel-gt-nextBackmerge to bring in 5.17-rc2 to introduce a common baselineto merge i915_regs changes from drm-intel-next.Signed-off-by: Joonas Lahtinen List of files: /linux/arch/um/.gitignore

063565aca3734de4e73639a0e460a58d9418b3cd - Merge drm/drm-next into drm-intel-next

Mon, 31 Jan 2022 19:19:33 +0100

Merge drm/drm-next into drm-intel-nextCatch-up with 5.17-rc2 and trying to align with drm-intel-gt-nextfor a possible topic branch for merging the split of i915_regs...Signed-off-by: Rodrigo Vivi List of files: /linux/arch/um/.gitignore

48ee4835b73c48590d05a54730dc8037ebd39d3b - Merge drm/drm-fixes into drm-misc-fixes

Wed, 26 Jan 2022 09:40:24 +0100

Merge drm/drm-fixes into drm-misc-fixesBackmerging drm/drm-fixes into drm-misc-fixes for v5.17-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/arch/um/.gitignore

1aa77e716c6f2332f2d4664f747ff4eba731825b - Merge remote-tracking branch 'torvalds/master' into perf/core

Thu, 13 Jan 2022 14:20:59 +0100

Merge remote-tracking branch 'torvalds/master' into perf/coreTo pick up fixes and get in line with other trees, powerpc kernelmostly this time, but BPF as well.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/arch/um/.gitignore

f69212114220edf8372867088b97b47760b6839d - Merge tag 'for-linus-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Wed, 12 Jan 2022 00:26:52 +0100

Merge tag 'for-linus-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/umlPull UML updates from Richard Weinberger: - set_fs removal - Devicetree support - Many cleanups from Al - Various virtio and build related fixes* tag 'for-linus-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (31 commits) um: virtio_uml: Allow probing from devicetree um: Add devicetree support um: Extract load file helper from initrd.c um: remove set_fs hostfs: Fix writeback of dirty pages um: Use swap() to make code cleaner um: header debriding - sigio.h um: header debriding - os.h um: header debriding - net_*.h um: header debriding - mem_user.h um: header debriding - activate_ipi() um: common-offsets.h debriding... um, x86: bury crypto_tfm_ctx_offset um: unexport handle_page_fault() um: remove a dangling extern of syscall_trace() um: kill unused cpu() uml/i386: missing include in barrier.h um: stop polluting the namespace with registers.h contents logic_io instance of iounmap() needs volatile on argument um: move amd64 variant of mmap(2) to arch/x86/um/syscalls_64.c ... List of files: /linux/arch/um/.gitignore

4b86366fdfbedec42f8f7ee037775f2839921d34 - um: gitignore: Add kernel/capflags.c

Mon, 13 Sep 2021 10:17:29 +0200

um: gitignore: Add kernel/capflags.cThis file is generated, we should ignore it.Fixes: d8fb32f4790f ("um: Add support for host CPU flags and alignment")Signed-off-by: Johannes Berg Acked-By: anton.ivanov@cambridgegreys.comSigned-off-by: Richard Weinberger List of files: /linux/arch/um/.gitignore

ead5d1f4d877e92c051e1a1ade623d0d30e71619 - Merge branch 'master' into for-next

Tue, 01 Sep 2020 14:19:48 +0200

Merge branch 'master' into for-nextSync with Linus' branch in order to be able to apply fixupsof more recent patches. List of files: /linux/arch/um/.gitignore

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

Sat, 08 Aug 2020 01:41:01 +0200

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

9b031c86506cef9acae45e61339fcf9deaabb793 - Merge branch 'elan-i2c' into next

Wed, 22 Jul 2020 04:02:33 +0200

Merge branch 'elan-i2c' into nextBring in update to Elan touchpad driver to support newer touchpads withhigher resolution. List of files: /linux/arch/um/.gitignore

16ba7e312045cd5d32fba0156312b4303f200787 - Merge branches 'for-5.7/upstream-fixes', 'for-5.8/apple', 'for-5.8/asus', 'for-5.8/core', 'for-5.8/intel-ish', 'for-5.8/logitech', 'for-5.8/mcp2221' and 'for-5.8/multitouch' into for-linus

Wed, 03 Jun 2020 22:23:52 +0200

Merge branches 'for-5.7/upstream-fixes', 'for-5.8/apple', 'for-5.8/asus', 'for-5.8/core', 'for-5.8/intel-ish', 'for-5.8/logitech', 'for-5.8/mcp2221' and 'for-5.8/multitouch' into for-linus List of files: /linux/arch/um/.gitignore

d053cf0d771f6547cb0537759a9af63cf402908d - Merge branch 'for-5.8' into for-linus

Mon, 01 Jun 2020 10:15:16 +0200

Merge branch 'for-5.8' into for-linus List of files: /linux/arch/um/.gitignore

1f422417945d08731e2915e0addb976f11b3a85a - Merge branch 'timers/drivers/timer-ti' into timers/drivers/next

Sat, 23 May 2020 00:01:13 +0200

Merge branch 'timers/drivers/timer-ti' into timers/drivers/next List of files: /linux/arch/um/.gitignore

4aef2ec9022b217f74d0f4c9b84081f07cc223d9 - Merge branch 'kvm-amd-fixes' into HEAD

Wed, 13 May 2020 18:14:05 +0200

Merge branch 'kvm-amd-fixes' into HEAD List of files: /linux/arch/um/.gitignore