Skip to content

Commit ab9b0d4

Browse files
authored
Merge pull request torvalds#537 from thehajime/merge-6.6
Merge v6.6
2 parents 6757641 + ccb6da2 commit ab9b0d4

File tree

24,413 files changed

+1046664
-414137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

24,413 files changed

+1046664
-414137
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ ForEachMacros:
254254
- 'for_each_free_mem_range'
255255
- 'for_each_free_mem_range_reverse'
256256
- 'for_each_func_rsrc'
257+
- 'for_each_group_device'
257258
- 'for_each_group_evsel'
258259
- 'for_each_group_member'
259260
- 'for_each_hstate'

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
*.[ch] diff=cpp
33
*.dts diff=dts
44
*.dts[io] diff=dts
5+
*.rs diff=rust

.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*.bin
1717
*.bz2
1818
*.c.[012]*.*
19-
*.cover
2019
*.dt.yaml
2120
*.dtb
2221
*.dtbo
@@ -34,7 +33,6 @@
3433
*.lz4
3534
*.lzma
3635
*.lzo
37-
*.mbx
3836
*.mod
3937
*.mod.c
4038
*.o
@@ -51,7 +49,6 @@
5149
*.symversions
5250
*.tab.[ch]
5351
*.tar
54-
*.usyms
5552
*.xz
5653
*.zst
5754
Module.symvers
@@ -77,7 +74,7 @@ modules.order
7774
#
7875
# RPM spec file (make rpm-pkg)
7976
#
80-
/*.spec
77+
/kernel.spec
8178
/rpmbuild/
8279

8380
#
@@ -112,7 +109,6 @@ modules.order
112109
#
113110
/include/config/
114111
/include/generated/
115-
/include/ksym/
116112
/arch/*/include/generated/
117113

118114
# stgit generated dirs

.mailmap

Lines changed: 123 additions & 4 deletions
Large diffs are not rendered by default.

CREDITS

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,12 @@ E: tomas@nocrew.org
383383
W: http://tomas.nocrew.org/
384384
D: dsp56k device driver
385385

386+
N: Srivatsa S. Bhat
387+
E: srivatsa@csail.mit.edu
388+
D: Maintainer of Generic Paravirt-Ops subsystem
389+
D: Maintainer of VMware hypervisor interface
390+
D: Maintainer of VMware virtual PTP clock driver (ptp_vmw)
391+
386392
N: Ross Biro
387393
E: ross.biro@gmail.com
388394
D: Original author of the Linux networking code
@@ -660,11 +666,6 @@ S: Tamsui town, Taipei county,
660666
S: Taiwan 251
661667
S: Republic of China
662668

663-
N: Reinette Chatre
664-
E: reinette.chatre@intel.com
665-
D: WiMedia Link Protocol implementation
666-
D: UWB stack bits and pieces
667-
668669
N: Michael Elizabeth Chastain
669670
E: mec@shout.net
670671
D: Configure, Menuconfig, xconfig
@@ -3017,12 +3018,6 @@ S: Demonstratsii 8-382
30173018
S: Tula 300000
30183019
S: Russia
30193020

3020-
N: Inaky Perez-Gonzalez
3021-
E: inaky.perez-gonzalez@intel.com
3022-
D: UWB stack, HWA-RC driver and HWA-HC drivers
3023-
D: Wireless USB additions to the USB stack
3024-
D: WiMedia Link Protocol bits and pieces
3025-
30263021
N: Gordon Peters
30273022
E: GordPeters@smarttech.com
30283023
D: Isochronous receive for IEEE 1394 driver (OHCI module).

Documentation/ABI/obsolete/o2cb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
What: /sys/o2cb
22
Date: Dec 2005
33
KernelVersion: 2.6.16
4-
Contact: ocfs2-devel@oss.oracle.com
4+
Contact: ocfs2-devel@lists.linux.dev
55
Description: Ocfs2-tools looks at 'interface-revision' for versioning
66
information. Each logmask/ file controls a set of debug prints
77
and can be written into with the strings "allow", "deny", or
88
"off". Reading the file returns the current state.
99
Was renamed to /sys/fs/u2cb/
1010
Users: ocfs2-tools. It's sufficient to mail proposed changes to
11-
ocfs2-devel@oss.oracle.com.
11+
ocfs2-devel@lists.linux.dev.

Documentation/ABI/removed/o2cb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
What: /sys/o2cb symlink
22
Date: May 2011
33
KernelVersion: 3.0
4-
Contact: ocfs2-devel@oss.oracle.com
4+
Contact: ocfs2-devel@lists.linux.dev
55
Description: This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is
66
removed when new versions of ocfs2-tools which know to look
77
in /sys/fs/o2cb are sufficiently prevalent. Don't code new
88
software to look here, it should try /sys/fs/o2cb instead.
99
Users: ocfs2-tools. It's sufficient to mail proposed changes to
10-
ocfs2-devel@oss.oracle.com.
10+
ocfs2-devel@lists.linux.dev.

Documentation/ABI/stable/o2cb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
What: /sys/fs/o2cb/
22
Date: Dec 2005
33
KernelVersion: 2.6.16
4-
Contact: ocfs2-devel@oss.oracle.com
4+
Contact: ocfs2-devel@lists.linux.dev
55
Description: Ocfs2-tools looks at 'interface-revision' for versioning
66
information. Each logmask/ file controls a set of debug prints
77
and can be written into with the strings "allow", "deny", or
88
"off". Reading the file returns the current state.
99
Users: ocfs2-tools. It's sufficient to mail proposed changes to
10-
ocfs2-devel@oss.oracle.com.
10+
ocfs2-devel@lists.linux.dev.

Documentation/ABI/stable/sysfs-block

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ Description:
295295
capable of executing requests targeting different sector ranges
296296
in parallel. For instance, single LUN multi-actuator hard-disks
297297
will have an independent_access_ranges directory if the device
298-
correctly advertizes the sector ranges of its actuators.
298+
correctly advertises the sector ranges of its actuators.
299299

300300
The independent_access_ranges directory contains one directory
301301
per access range, with each range described using the sector

Documentation/ABI/stable/sysfs-bus-mhi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/bus/mhi/devices/.../serialnumber
22
Date: Sept 2020
33
KernelVersion: 5.10
4-
Contact: Bhaumik Bhatt <bbhatt@codeaurora.org>
4+
Contact: mhi@lists.linux.dev
55
Description: The file holds the serial number of the client device obtained
66
using a BHI (Boot Host Interface) register read after at least
77
one attempt to power up the device has been done. If read
@@ -12,7 +12,7 @@ Users: Any userspace application or clients interested in device info.
1212
What: /sys/bus/mhi/devices/.../oem_pk_hash
1313
Date: Sept 2020
1414
KernelVersion: 5.10
15-
Contact: Bhaumik Bhatt <bbhatt@codeaurora.org>
15+
Contact: mhi@lists.linux.dev
1616
Description: The file holds the OEM PK Hash value of the endpoint device
1717
obtained using a BHI (Boot Host Interface) register read after
1818
at least one attempt to power up the device has been done. If

0 commit comments

Comments
 (0)