Changes in .gitattributes

cdd5b5a9761fd66d17586e4f4ba6588c70e640ea - Merge branch 'next' into for-linus

Mon, 06 Nov 2023 23:42:08 +0000

Merge branch 'next' into for-linusPrepare input updates for 6.7 merge window. List of files: /linux/.gitattributes

34069d12e239ae8f36dd96c378e4622fb1c42a76 - Merge tag 'v6.5' into next

Tue, 05 Sep 2023 21:08:14 +0000

Merge tag 'v6.5' into nextSync up with mainline to bring in updates to the shared infrastructure. List of files: /linux/.gitattributes

2612e3bbc0386368a850140a6c9b990cd496a5ec - Merge drm/drm-next into drm-intel-next

Mon, 07 Aug 2023 21:14:42 +0000

Merge drm/drm-next into drm-intel-nextCatching-up with drm-next and drm-intel-gt-next.It will unblock a code refactor around the platformdefinitions (names vs acronyms).Signed-off-by: Rodrigo Vivi List of files: /linux/.gitattributes

9f771739a04919226081a107167596de75108fbb - Merge drm/drm-next into drm-intel-gt-next

Mon, 07 Aug 2023 10:29:40 +0000

Merge drm/drm-next into drm-intel-gt-nextNeed to pull in b3e4aae612ec ("drm/i915/hdcp: Modify hdcp_gsc_message msg sending mechanism") asa dependency for https://patchwork.freedesktop.org/series/121735/Signed-off-by: Joonas Lahtinen List of files: /linux/.gitattributes

61b7369483efb5e0a9f3b48e75fac00d46d661e0 - Merge drm/drm-next into drm-misc-next

Mon, 24 Jul 2023 13:44:47 +0000

Merge drm/drm-next into drm-misc-nextBackmerging to get v6.5-rc2.Signed-off-by: Thomas Zimmermann List of files: /linux/.gitattributes

0791faebfe750292a8a842b64795a390ca4a3b51 - ASoC: Merge v6.5-rc2

Mon, 17 Jul 2023 05:12:31 +0000

ASoC: Merge v6.5-rc2Get a similar baseline to my other branches, and fixes for people usingthe branch. List of files: /linux/.gitattributes

2f98e686ef59b5d19af5847d755798e2031bee3a - Merge v6.5-rc1 into drm-misc-fixes

Tue, 11 Jul 2023 07:23:20 +0000

Merge v6.5-rc1 into drm-misc-fixesBoris needs 6.5-rc1 in drm-misc-fixes to prevent a conflict.Signed-off-by: Maxime Ripard List of files: /linux/.gitattributes

44f10dbefd5e41b3385af91f855a57aa2afaf40e - Merge branch 'master' into mm-hotfixes-stable

Fri, 30 Jun 2023 15:41:39 +0000

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

a1257b5e3b7f8a21faf462d0118067fe31e71ffb - Merge tag 'rust-6.5' of https://github.com/Rust-for-Linux/linux

Mon, 26 Jun 2023 16:35:50 +0000

Merge tag 'rust-6.5' of https://github.com/Rust-for-Linux/linuxPull rust updates from Miguel Ojeda: "A fairly small one in terms of feature additions. Most of the changes in terms of lines come from the upgrade to the new version of the toolchain (which in turn is big due to the vendored 'alloc' crate). Upgrade to Rust 1.68.2: - This is the first such upgrade, and we will try to update it often from now on, in order to remain close to the latest release, until a minimum version (which is "in the future") can be established. The upgrade brings the stabilization of 4 features we used (and 2 more that we used in our old 'rust' branch). Commit 3ed03f4da06e ("rust: upgrade to Rust 1.68.2") contains the details and rationale. pin-init API: - Several internal improvements and fixes to the pin-init API, e.g. allowing to use 'Self' in a struct definition with '#[pin_data]'. 'error' module: - New 'name()' method for the 'Error' type (with 'errname()' integration), used to implement the 'Debug' trait for 'Error'. - Add error codes from 'include/linux/errno.h' to the list of Rust 'Error' constants. - Allow specifying error type on the 'Result' type (with the default still being our usual 'Error' type). 'str' module: - 'TryFrom' implementation for 'CStr', and new 'to_cstring()' method based on it. 'sync' module: - Implement 'AsRef' trait for 'Arc', allowing to use 'Arc' in code that is generic over smart pointer types. - Add 'ptr_eq' method to 'Arc' for easier, less error prone comparison between two 'Arc' pointers. - Reword the 'Send' safety comment for 'Arc', and avoid referencing it from the 'Sync' one. 'task' module: - Implement 'Send' marker for 'Task'. 'types' module: - Implement 'Send' and 'Sync' markers for 'ARef' when 'T' is 'AlwaysRefCounted', 'Send' and 'Sync'. Other changes: - Documentation improvements and '.gitattributes' change to start using the Rust diff driver"* tag 'rust-6.5' of https://github.com/Rust-for-Linux/linux: rust: error: `impl Debug` for `Error` with `errname()` integration rust: task: add `Send` marker to `Task` rust: specify when `ARef` is thread safe rust: sync: reword the `Arc` safety comment for `Sync` rust: sync: reword the `Arc` safety comment for `Send` rust: sync: implement `AsRef` for `Arc` rust: sync: add `Arc::ptr_eq` rust: error: add missing error codes rust: str: add conversion from `CStr` to `CString` rust: error: allow specifying error type on `Result` rust: init: update macro expansion example in docs rust: macros: replace Self with the concrete type in #[pin_data] rust: macros: refactor generics parsing of `#[pin_data]` into its own function rust: macros: fix usage of `#[allow]` in `quote!` docs: rust: point directly to the standalone installers .gitattributes: set diff driver for Rust source code files rust: upgrade to Rust 1.68.2 rust: arc: fix intra-doc link in `Arc::init` rust: alloc: clarify what is the upstream version List of files: /linux/.gitattributes

8f8d4be9fb69ce0aa8f87570d9a71413ff726982 - .gitattributes: set diff driver for Rust source code files

Tue, 18 Apr 2023 23:30:48 +0000

.gitattributes: set diff driver for Rust source code filesGit supports a builtin Rust diff driver [1] since v2.23.0 (2019).It improves the choice of hunk headers in some cases, such asdiffs within methods, since those are indented in Rust withinan `impl` block, and therefore the default diff driver wouldpick the outer `impl` block instead (rather than the methodwhere the changed code is).For instance, with the default diff driver: @@ -455,6 +455,8 @@ impl fmt::Write for RawFormatter { // Amount that we can copy. `saturating_sub` ensures we get 0 if `pos` goes past `end`. let len_to_copy = core::cmp::min(pos_new, self.end).saturating_sub(self.pos); + test_diff_driver(); + if len_to_copy > 0 { // SAFETY: If `len_to_copy` is non-zero, then we know `pos` has not gone past `end` // yet, so it is valid for write per the type invariants.With the Rust diff driver: @@ -455,6 +455,8 @@ fn write_str(&mut self, s: &str) -> fmt::Result { // Amount that we can copy. `saturating_sub` ensures we get 0 if `pos` goes past `end`. let len_to_copy = core::cmp::min(pos_new, self.end).saturating_sub(self.pos); + test_diff_driver(); + if len_to_copy > 0 { // SAFETY: If `len_to_copy` is non-zero, then we know `pos` has not gone past `end` // yet, so it is valid for write per the type invariants.Thus set the `rust` diff driver for `*.rs` source files.The Rust repository also does so since 2020 [2].Link: https://git-scm.com/docs/gitattributes#_defining_a_custom_hunk_header [1]Link: https://github.com/rust-lang/rust/pull/78882 [2]Reviewed-by: Gary Guo Reviewed-by: Martin Rodriguez Reboredo Reviewed-by: Benno Lossin Link: https://lore.kernel.org/r/20230418233048.335281-1-ojeda@kernel.org[ Added link to Rust repository ]Signed-off-by: Miguel Ojeda List of files: /linux/.gitattributes

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

Mon, 01 May 2023 22:20:08 +0000

Merge branch 'next' into for-linusPrepare input updates for 6.4 merge window. List of files: /linux/.gitattributes

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

Wed, 26 Apr 2023 20:52:34 +0000

Merge branch 'for-6.4/amd-sfh' into for-linus- assorted functional fixes for amd-sfh driver (Basavaraj Natikar) List of files: /linux/.gitattributes

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

Tue, 11 Apr 2023 12:43:45 +0000

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/.gitattributes

cecdd52a3dd312564f81a39df08378b7b39a2654 - Merge drm/drm-next into drm-intel-next

Tue, 28 Mar 2023 14:30:57 +0000

Merge drm/drm-next into drm-intel-nextCatch up with 6.3-rc cycle...Signed-off-by: Rodrigo Vivi List of files: /linux/.gitattributes

e752ab11dcb48353727ea26eefd740155e028865 - Merge remote-tracking branch 'drm/drm-next' into msm-next

Mon, 20 Mar 2023 17:31:25 +0000

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/.gitattributes

d26a3a6ce7e02f9c056ad992bcd9624735022337 - Merge tag 'v6.3-rc2' into next

Fri, 17 Mar 2023 11:01:30 +0000

Merge tag 'v6.3-rc2' into nextMerge with mainline to get of_property_present() and other newer APIs. List of files: /linux/.gitattributes

b3c9a04135bdbd3aabd5e9534bad0fe6df505f8a - Merge drm/drm-fixes into drm-misc-fixes

Mon, 13 Mar 2023 09:14:05 +0000

Merge drm/drm-fixes into drm-misc-fixesBackmerging to get latest upstream.Signed-off-by: Thomas Zimmermann List of files: /linux/.gitattributes

a1eccc574f977bd21a4ec8ac54bd73a2756bd281 - Merge drm/drm-next into drm-misc-next

Mon, 13 Mar 2023 08:27:50 +0000

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/.gitattributes

b8fa3e3833c14151a47ebebbc5427dcfe94bb407 - Merge remote-tracking branch 'acme/perf-tools' into perf-tools-next

Fri, 10 Mar 2023 21:43:17 +0000

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/.gitattributes

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

Sun, 26 Feb 2023 19:53:25 +0000

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/.gitattributes