Skip to content

Commit 8b7e885

Browse files
committed
Merge tag 'v6.1.100' into sbc-6.1.y
This is the 6.1.100 stable release # gpg: Signatur vom Do 18 Jul 2024 13:19:57 CEST # gpg: mittels RSA-Schlüssel 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Signatur kann nicht geprüft werden: No public key
2 parents 1c42987 + 9b3f9a5 commit 8b7e885

File tree

344 files changed

+3259
-1965
lines changed

Some content is hidden

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

344 files changed

+3259
-1965
lines changed

Documentation/admin-guide/cifs/usage.rst

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -722,40 +722,26 @@ Configuration pseudo-files:
722722
======================= =======================================================
723723
SecurityFlags Flags which control security negotiation and
724724
also packet signing. Authentication (may/must)
725-
flags (e.g. for NTLM and/or NTLMv2) may be combined with
725+
flags (e.g. for NTLMv2) may be combined with
726726
the signing flags. Specifying two different password
727727
hashing mechanisms (as "must use") on the other hand
728728
does not make much sense. Default flags are::
729729

730-
0x07007
731-
732-
(NTLM, NTLMv2 and packet signing allowed). The maximum
733-
allowable flags if you want to allow mounts to servers
734-
using weaker password hashes is 0x37037 (lanman,
735-
plaintext, ntlm, ntlmv2, signing allowed). Some
736-
SecurityFlags require the corresponding menuconfig
737-
options to be enabled. Enabling plaintext
738-
authentication currently requires also enabling
739-
lanman authentication in the security flags
740-
because the cifs module only supports sending
741-
laintext passwords using the older lanman dialect
742-
form of the session setup SMB. (e.g. for authentication
743-
using plain text passwords, set the SecurityFlags
744-
to 0x30030)::
730+
0x00C5
731+
732+
(NTLMv2 and packet signing allowed). Some SecurityFlags
733+
may require enabling a corresponding menuconfig option.
745734

746735
may use packet signing 0x00001
747736
must use packet signing 0x01001
748-
may use NTLM (most common password hash) 0x00002
749-
must use NTLM 0x02002
750737
may use NTLMv2 0x00004
751738
must use NTLMv2 0x04004
752-
may use Kerberos security 0x00008
753-
must use Kerberos 0x08008
754-
may use lanman (weak) password hash 0x00010
755-
must use lanman password hash 0x10010
756-
may use plaintext passwords 0x00020
757-
must use plaintext passwords 0x20020
758-
(reserved for future packet encryption) 0x00040
739+
may use Kerberos security (krb5) 0x00008
740+
must use Kerberos 0x08008
741+
may use NTLMSSP 0x00080
742+
must use NTLMSSP 0x80080
743+
seal (packet encryption) 0x00040
744+
must seal (not implemented yet) 0x40040
759745

760746
cifsFYI If set to non-zero value, additional debug information
761747
will be logged to the system error log. This field

Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Copyright 2019 BayLibre, SAS
33
%YAML 1.2
44
---
5-
$id: "http://devicetree.org/schemas/i2c/amlogic,meson6-i2c.yaml#"
6-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
5+
$id: http://devicetree.org/schemas/i2c/amlogic,meson6-i2c.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
77

88
title: Amlogic Meson I2C Controller
99

Documentation/devicetree/bindings/i2c/apple,i2c.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: "http://devicetree.org/schemas/i2c/apple,i2c.yaml#"
5-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
4+
$id: http://devicetree.org/schemas/i2c/apple,i2c.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Apple/PASemi I2C controller
88

Documentation/devicetree/bindings/i2c/atmel,at91sam-i2c.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ required:
7575
- clocks
7676

7777
allOf:
78-
- $ref: "i2c-controller.yaml"
78+
- $ref: /schemas/i2c/i2c-controller.yaml#
7979
- if:
8080
properties:
8181
compatible:

Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: "http://devicetree.org/schemas/i2c/cdns,i2c-r1p10.yaml#"
5-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
4+
$id: http://devicetree.org/schemas/i2c/cdns,i2c-r1p10.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Cadence I2C controller
88

Documentation/devicetree/bindings/i2c/i2c-mux-gpio.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ properties:
4545

4646
i2c-parent:
4747
description: phandle of the I2C bus that this multiplexer's master-side port is connected to
48-
$ref: "/schemas/types.yaml#/definitions/phandle"
48+
$ref: /schemas/types.yaml#/definitions/phandle
4949

5050
mux-gpios:
5151
description: list of GPIOs used to control the muxer
@@ -55,7 +55,7 @@ properties:
5555
idle-state:
5656
description: Value to set the muxer to when idle. When no value is given, it defaults to the
5757
last value used.
58-
$ref: "/schemas/types.yaml#/definitions/uint32"
58+
$ref: /schemas/types.yaml#/definitions/uint32
5959

6060
allOf:
6161
- $ref: i2c-mux.yaml

Documentation/devicetree/bindings/i2c/qcom,i2c-geni-qcom.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: "http://devicetree.org/schemas/i2c/qcom,i2c-geni-qcom.yaml#"
5-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
4+
$id: http://devicetree.org/schemas/i2c/qcom,i2c-geni-qcom.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Qualcomm Geni based QUP I2C Controller
88

Documentation/devicetree/bindings/i2c/st,stm32-i2c.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ properties:
9090
st,syscfg-fmp:
9191
description: Use to set Fast Mode Plus bit within SYSCFG when Fast Mode
9292
Plus speed is selected by slave.
93-
$ref: "/schemas/types.yaml#/definitions/phandle-array"
93+
$ref: /schemas/types.yaml#/definitions/phandle-array
9494
items:
9595
- items:
9696
- description: phandle to syscfg

Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: "http://devicetree.org/schemas/i2c/xlnx,xps-iic-2.00.a.yaml#"
5-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
4+
$id: http://devicetree.org/schemas/i2c/xlnx,xps-iic-2.00.a.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Xilinx IIC controller
88

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 1
4-
SUBLEVEL = 96
4+
SUBLEVEL = 100
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

0 commit comments

Comments
 (0)