Unverified Commit d3e82939 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15625 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.75-6.6.76 LTS Patches 

Merge Pull Request from: @koishimind 
 
git log --oneline v6.6.75..v6.6.76 | wc -l
388
362+2+1+23+2

check-kabi error(2):
sched/fair: Fix value reported by hot tasks pulled in /proc/schedstat
pps: Fix a use-after-free

conflicts(1):
cpufreq: ACPI: Fix max-frequency computation

merged(23):
NFSD: Reset cb_seq_status after NFS4ERR_DELAY
usb: xhci: Fix NULL pointer dereference on certain command aborts
ipmr: do not call mr_mfc_uses_dev() for unres entries
net: hns3: fix oops when unload drivers paralleling
rtc: loongson: clear TOY_MATCH0_REG in loongson_rtc_isr()
rtc: pcf85063: fix potential OOB write in PCF85063 NVMEM read
LoongArch: Fix warnings during S3 suspend
PCI: rcar-ep: Fix incorrect variable used when calling devm_request_mem_region()
iommufd/iova_bitmap: Fix shift-out-of-bounds in iova_bitmap_offset_to_index()
bpf: Send signals asynchronously if !preemptible
crypto: hisilicon/sec2 - fix for aead invalid authsize
crypto: hisilicon/sec2 - fix for aead icv error
crypto: hisilicon/sec2 - optimize the error return process
bpf_local_storage: Always use bpf_mem_alloc in PREEMPT_RT
libbpf: Fix segfault due to libelf functions not setting errno
wifi: wcn36xx: fix channel survey memory allocation size
genirq: Make handle_enforce_irqctx() unconditionally available
OPP: add index check to assert to avoid buffer overflow in _read_freq()
perf/core: Save raw sample data conditionally based on sample type
nvme: fix bogus kzalloc() return check in nvme_init_effects_log()
nvme: Add error path for xa_store in nvme_init_effects
nvme: Add error check for xa_store in nvme_get_effects_log
nbd: don't allow reconnect after disconnect

check-depends(2):
HID: hid-thrustmaster: fix stack-out-of-bounds read in usb_check_int_endpoints()
Revert "drivers/card_reader/rtsx_usb: Restore interrupt based detection"
 
 
Link:https://gitee.com/openeuler/kernel/pulls/15625

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 0278be80 b07f9ee3

Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ properties: 
    description: |

      For multicolor LED support this property should be defined as either

      LED_COLOR_ID_RGB or LED_COLOR_ID_MULTI which can be found in

      include/linux/leds/common.h.

      include/dt-bindings/leds/common.h.

    enum: [ 8, 9 ]



required:

Documentation/devicetree/bindings/mfd/rohm,bd71815-pmic.yaml

+10 −10
Original line number Diff line number Diff line
@@ -50,15 +50,15 @@ properties: 
    minimum: 0

    maximum: 1



  rohm,charger-sense-resistor-ohms:

    minimum: 10000000

    maximum: 50000000

  rohm,charger-sense-resistor-micro-ohms:

    minimum: 10000

    maximum: 50000

    description: |

      BD71827 and BD71828 have SAR ADC for measuring charging currents.

      External sense resistor (RSENSE in data sheet) should be used. If

      something other but 30MOhm resistor is used the resistance value

      should be given here in Ohms.

    default: 30000000

      BD71815 has SAR ADC for measuring charging currents. External sense

      resistor (RSENSE in data sheet) should be used. If something other

      but a 30 mOhm resistor is used the resistance value should be given

      here in micro Ohms.

    default: 30000



  regulators:

    $ref: ../regulator/rohm,bd71815-regulator.yaml
@@ -67,7 +67,7 @@ properties: 


  gpio-reserved-ranges:

    description: |

      Usage of BD71828 GPIO pins can be changed via OTP. This property can be

      Usage of BD71815 GPIO pins can be changed via OTP. This property can be

      used to mark the pins which should not be configured for GPIO. Please see

      the ../gpio/gpio.txt for more information.
@@ -113,7 +113,7 @@ examples: 
            gpio-controller;

            #gpio-cells = <2>;



            rohm,charger-sense-resistor-ohms = <10000000>;

            rohm,charger-sense-resistor-micro-ohms = <10000>;



            regulators {

                buck1: buck1 {

Documentation/devicetree/bindings/mmc/mmc-controller.yaml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ properties: 
  "#address-cells":

    const: 1

    description: |

      The cell is the slot ID if a function subnode is used.

      The cell is the SDIO function number if a function subnode is used.



  "#size-cells":

    const: 0

Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml

+0 −6
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ properties: 
        $ref: regulator.yaml#

        unevaluatedProperties: false



        properties:

          regulator-compatible:

            pattern: "^vbuck[1-4]$"



    additionalProperties: false



required:
@@ -52,7 +48,6 @@ examples: 


      regulators {

        vbuck1 {

          regulator-compatible = "vbuck1";

          regulator-min-microvolt = <300000>;

          regulator-max-microvolt = <1193750>;

          regulator-enable-ramp-delay = <256>;
@@ -60,7 +55,6 @@ examples: 
        };



        vbuck3 {

          regulator-compatible = "vbuck3";

          regulator-min-microvolt = <300000>;

          regulator-max-microvolt = <1193750>;

          regulator-enable-ramp-delay = <256>;

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ KGZIP = gzip 
KBZIP2		= bzip2

KLZOP		= lzop

LZMA		= lzma

LZ4		= lz4c

LZ4		= lz4

XZ		= xz

ZSTD		= zstd