Skip to content

Commit 3904d07

Browse files
frank-wfrank-w
committed
Merge tag 'v6.18.53' into 6.18-main
This is the 6.18.53 stable release
2 parents a638fab + e8694cd commit 3904d07

1,201 files changed

Lines changed: 16493 additions & 8653 deletions

File tree

Some content is hidden

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

‎Documentation/ABI/testing/sysfs-fs-erofs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Date: November 2021
33
Contact: "Huang Jianan" <huangjianan@oppo.com>
44
Description: Shows all enabled kernel features.
55
Supported features:
6-
zero_padding, compr_cfgs, big_pcluster, chunked_file,
7-
device_table, compr_head2, sb_chksum, ztailpacking,
8-
dedupe, fragments, 48bit, metabox.
6+
compr_cfgs, big_pcluster, chunked_file, device_table,
7+
compr_head2, sb_chksum, ztailpacking, dedupe, fragments,
8+
xattr_prefixes, 48bit, metabox.
99

1010
What: /sys/fs/erofs/<disk>/sync_decompress
1111
Date: November 2021

‎Documentation/hwmon/gpd-fan.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ pwm1_enable
6464
at full speed. Write "1" to set to manual, write "2" to let the EC control
6565
decide fan speed. Read this attribute to see current status.
6666

67-
NB：In consideration of the safety of the device, when setting to manual mode,
67+
NB: In consideration of the safety of the device, when setting to manual mode,
6868
the pwm speed will be set to the maximum value (255) by default. You can set
6969
a different value by writing pwm1 later.
7070

‎Documentation/hwmon/hwmon-kernel-api.rst‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ register/unregister functions::
4242

4343
char *devm_hwmon_sanitize_name(struct device *dev, const char *name);
4444

45+
int hwmon_notify_event(struct device *dev, enum hwmon_sensor_types type,
46+
u32 attr, int channel);
47+
4548
void hwmon_lock(struct device *dev);
4649
void hwmon_unlock(struct device *dev);
4750

@@ -90,6 +93,18 @@ implemented in the driver, or debugfs functions, hwmon_lock() and hwmon_unlock()
9093
can be used to ensure that calls to those functions are serialized. Those
9194
functions also support guard() and scoped_guard() variants.
9295

96+
Drivers can call hwmon_notify_event() to notify userspace and the thermal
97+
subsystem when a hardware monitoring event (such as an alarm or a fault
98+
condition) occurs or clears. The parameters are the hwmon device, the sensor
99+
type, the attribute identifier associated with the event (such as
100+
hwmon_temp_max_alarm or hwmon_fan_fault), and the sensor channel number.
101+
hwmon_notify_event() generates a sysfs event (calling sysfs_notify()) and a
102+
udev event with the attribute name passed in the NAME environment property
103+
(e.g., "NAME=temp1_max_alarm"). If the event is for a temperature sensor and
104+
the sensor is attached to a thermal zone, it also notifies the thermal
105+
subsystem to update the thermal zone. hwmon_notify_event() returns 0 on
106+
success or a negative error code on failure.
107+
93108
Using devm_hwmon_device_register_with_info()
94109
--------------------------------------------
95110

‎Documentation/netlink/specs/rt-link.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,8 @@ attribute-sets:
881881
-
882882
name: txqlen
883883
type: u32
884+
checks:
885+
max: 32767
884886
-
885887
name: map
886888
type: binary

‎Documentation/networking/net_cachelines/inet_connection_sock.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ struct inet_sock icsk_inet read_mostly r
1212
struct request_sock_queue icsk_accept_queue
1313
struct inet_bind_bucket icsk_bind_hash read_mostly tcp_set_state
1414
struct inet_bind2_bucket icsk_bind2_hash read_mostly tcp_set_state,inet_put_port
15-
struct timer_list icsk_retransmit_timer read_write inet_csk_reset_xmit_timer,tcp_connect
1615
struct timer_list icsk_delack_timer read_mostly inet_csk_reset_xmit_timer,tcp_connect
16+
struct timer_list icsk_keepalive_timer
1717
u32 icsk_rto read_write tcp_cwnd_validate,tcp_schedule_loss_probe,tcp_connect_init,tcp_connect,tcp_write_xmit,tcp_push_one
1818
u32 icsk_rto_min
1919
u32 icsk_rto_max read_mostly tcp_reset_xmit_timer

‎Documentation/scheduler/sched-ext.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ optional. The following modified excerpt is from
181181
182182
void BPF_STRUCT_OPS(simple_exit, struct scx_exit_info *ei)
183183
{
184-
exit_type = ei->type;
184+
exit_type = ei->kind;
185185
}
186186
187187
SEC(".struct_ops")

‎MAINTAINERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24966,6 +24966,7 @@ R: Jan Dabros <jsd@semihalf.com>
2496624966
L: linux-i2c@vger.kernel.org
2496724967
S: Supported
2496824968
F: drivers/i2c/busses/i2c-designware-*
24969+
F: include/linux/designware_i2c.h
2496924970

2497024971
SYNOPSYS DESIGNWARE I2C DRIVER - AMDISP
2497124972
M: Nirujogi Pratap <pratap.nirujogi@amd.com>

‎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 = 18
4-
SUBLEVEL = 52
4+
SUBLEVEL = 53
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

‎arch/arm/boot/dts/nvidia/tegra30-asus-tf600t.dts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,9 +1040,9 @@
10401040
vdd-supply = <&vdd_3v3_sys>;
10411041
vddio-supply = <&vdd_1v8_vio>;
10421042

1043-
mount-matrix = "0", "-1", "0",
1044-
"-1", "0", "0",
1045-
"0", "0", "-1";
1043+
mount-matrix = "0", "1", "0",
1044+
"1", "0", "0",
1045+
"0", "0", "1";
10461046

10471047
/* External I2C interface */
10481048
i2c-gate {

‎arch/arm/boot/dts/nvidia/tegra30-lg-p880.dts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,4 +486,17 @@
486486

487487
nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
488488
};
489+
490+
thermal-zones {
491+
cpu-thermal {
492+
trips {
493+
cpu-alert {
494+
/* throttle at 60C until temperature drops to 59.8C */
495+
temperature = <60000>;
496+
hysteresis = <200>;
497+
type = "passive";
498+
};
499+
};
500+
};
501+
};
489502
};

0 commit comments

Comments
 (0)