Skip to content

Commit 9d56cb7

Browse files
ionutnechitaionutnechita
committed
SUNLIGHT: Stable 07/22/2024 - KERNEL.ORG
Description: - Stable 07/22/2024 - KERNEL.ORG Change-Id: Ic59c33b68b806636e67e1ab173ad206e41906c28 Signed-off-by: Ionut Nechita <ionut_n2001@yahoo.com>
2 parents a320b30 + 73c962e commit 9d56cb7

File tree

327 files changed

+3243
-1448
lines changed

Some content is hidden

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

327 files changed

+3243
-1448
lines changed

‎Documentation/admin-guide/cifs/usage.rst

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

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

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

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

‎Documentation/devicetree/bindings/cache/qcom,llcc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ allOf:
6666
compatible:
6767
contains:
6868
enum:
69-
- qcom,qdu1000-llcc
7069
- qcom,sc7180-llcc
7170
- qcom,sm6350-llcc
7271
then:
@@ -104,6 +103,7 @@ allOf:
104103
compatible:
105104
contains:
106105
enum:
106+
- qcom,qdu1000-llcc
107107
- qcom,sc8180x-llcc
108108
- qcom,sc8280xp-llcc
109109
- qcom,x1e80100-llcc

‎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 = 9
4-
SUBLEVEL = 8
4+
SUBLEVEL = 10
55
EXTRAVERSION =
66
NAME = Hurr durr I'ma ninja sloth
77

‎arch/arm/mach-davinci/pm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static void davinci_pm_suspend(void)
6161

6262
/* Configure sleep count in deep sleep register */
6363
val = __raw_readl(pm_config.deepsleep_reg);
64-
val &= ~DEEPSLEEP_SLEEPCOUNT_MASK,
64+
val &= ~DEEPSLEEP_SLEEPCOUNT_MASK;
6565
val |= pm_config.sleepcount;
6666
__raw_writel(val, pm_config.deepsleep_reg);
6767

‎arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
compatible = "x-powers,axp803";
192192
reg = <0x3a3>;
193193
interrupt-parent = <&r_intc>;
194-
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_LOW>;
194+
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
195195
x-powers,drive-vbus-en;
196196

197197
vin1-supply = <&reg_vcc5v>;

‎arch/arm64/boot/dts/qcom/qdu1000.dtsi

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1459,9 +1459,23 @@
14591459

14601460
system-cache-controller@19200000 {
14611461
compatible = "qcom,qdu1000-llcc";
1462-
reg = <0 0x19200000 0 0xd80000>,
1462+
reg = <0 0x19200000 0 0x80000>,
1463+
<0 0x19300000 0 0x80000>,
1464+
<0 0x19600000 0 0x80000>,
1465+
<0 0x19700000 0 0x80000>,
1466+
<0 0x19a00000 0 0x80000>,
1467+
<0 0x19b00000 0 0x80000>,
1468+
<0 0x19e00000 0 0x80000>,
1469+
<0 0x19f00000 0 0x80000>,
14631470
<0 0x1a200000 0 0x80000>;
14641471
reg-names = "llcc0_base",
1472+
"llcc1_base",
1473+
"llcc2_base",
1474+
"llcc3_base",
1475+
"llcc4_base",
1476+
"llcc5_base",
1477+
"llcc6_base",
1478+
"llcc7_base",
14651479
"llcc_broadcast_base";
14661480
interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
14671481
};

‎arch/arm64/boot/dts/qcom/sa8775p.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3605,7 +3605,7 @@
36053605
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
36063606
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
36073607
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
3608-
<GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
3608+
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
36093609
};
36103610

36113611
pcie0: pcie@1c00000 {

‎arch/arm64/boot/dts/qcom/sc8180x.dtsi

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2608,11 +2608,14 @@
26082608

26092609
system-cache-controller@9200000 {
26102610
compatible = "qcom,sc8180x-llcc";
2611-
reg = <0 0x09200000 0 0x50000>, <0 0x09280000 0 0x50000>,
2612-
<0 0x09300000 0 0x50000>, <0 0x09380000 0 0x50000>,
2613-
<0 0x09600000 0 0x50000>;
2611+
reg = <0 0x09200000 0 0x58000>, <0 0x09280000 0 0x58000>,
2612+
<0 0x09300000 0 0x58000>, <0 0x09380000 0 0x58000>,
2613+
<0 0x09400000 0 0x58000>, <0 0x09480000 0 0x58000>,
2614+
<0 0x09500000 0 0x58000>, <0 0x09580000 0 0x58000>,
2615+
<0 0x09600000 0 0x58000>;
26142616
reg-names = "llcc0_base", "llcc1_base", "llcc2_base",
2615-
"llcc3_base", "llcc_broadcast_base";
2617+
"llcc3_base", "llcc4_base", "llcc5_base",
2618+
"llcc6_base", "llcc7_base", "llcc_broadcast_base";
26162619
interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
26172620
};
26182621

‎arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -618,15 +618,16 @@
618618

619619
status = "okay";
620620

621-
/* FIXME: verify */
622621
touchscreen@10 {
623-
compatible = "hid-over-i2c";
622+
compatible = "elan,ekth5015m", "elan,ekth6915";
624623
reg = <0x10>;
625624

626-
hid-descr-addr = <0x1>;
627625
interrupts-extended = <&tlmm 175 IRQ_TYPE_LEVEL_LOW>;
628-
vdd-supply = <&vreg_misc_3p3>;
629-
vddl-supply = <&vreg_s10b>;
626+
reset-gpios = <&tlmm 99 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
627+
no-reset-on-power-off;
628+
629+
vcc33-supply = <&vreg_misc_3p3>;
630+
vccio-supply = <&vreg_misc_3p3>;
630631

631632
pinctrl-names = "default";
632633
pinctrl-0 = <&ts0_default>;
@@ -1417,8 +1418,8 @@
14171418
reset-n-pins {
14181419
pins = "gpio99";
14191420
function = "gpio";
1420-
output-high;
1421-
drive-strength = <16>;
1421+
drive-strength = <2>;
1422+
bias-disable;
14221423
};
14231424
};
14241425

‎arch/arm64/boot/dts/qcom/sm6115.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,6 +1090,7 @@
10901090

10911091
power-domains = <&rpmpd SM6115_VDDCX>;
10921092
operating-points-v2 = <&sdhc1_opp_table>;
1093+
iommus = <&apps_smmu 0x00c0 0x0>;
10931094
interconnects = <&system_noc MASTER_SDCC_1 RPM_ALWAYS_TAG
10941095
&bimc SLAVE_EBI_CH0 RPM_ALWAYS_TAG>,
10951096
<&bimc MASTER_AMPSS_M0 RPM_ALWAYS_TAG

0 commit comments

Comments
 (0)