Skip to content

Commit a88abcd

Browse files
opsiffopsiff
authored
Merge branch 'linux-6.6.y' into linux-6.6.y-2025-06-23
2 parents 90b9fdc + 2f371f2 commit a88abcd

File tree

2,838 files changed

+165988
-28314
lines changed

Some content is hidden

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

2,838 files changed

+165988
-28314
lines changed

‎.github/workflows/build-kernel-arm64.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ jobs:
2828
make deepin_arm64_desktop_defconfig
2929
make -j$(nproc)
3030
31-
- name: 'Upload Kernel Artifact'
32-
uses: actions/upload-artifact@v4
33-
with:
34-
name: Kernel-ABI-arm64
35-
path: "Module.symvers"
36-
3731
- name: 'Clang build kernel'
3832
run: |
3933
# .config

‎.github/workflows/build-kernel-loong64.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,3 @@ jobs:
2727
# .config
2828
time make ARCH=loongarch CROSS_COMPILE=loongarch64-linux-gnu- deepin_loongarch_desktop_defconfig
2929
time make ARCH=loongarch CROSS_COMPILE=loongarch64-linux-gnu- -j$(nproc)
30-
31-
- name: 'Upload Kernel Artifact'
32-
uses: actions/upload-artifact@v4
33-
with:
34-
name: Kernel-ABI-loong64
35-
path: "Module.symvers"

‎.github/workflows/build-kernel-riscv64.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,3 @@ jobs:
2727
# .config
2828
time make ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- deepin_riscv64_desktop_defconfig
2929
time make ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- -j$(nproc)
30-
31-
- name: 'Upload Kernel Artifact'
32-
uses: actions/upload-artifact@v4
33-
with:
34-
name: Kernel-ABI-riscv64
35-
path: "Module.symvers"

‎.github/workflows/build-kernel-s390.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,3 @@ jobs:
2727
# .config
2828
make deepin_s390x_z13_defconfig
2929
make -j$(nproc)
30-
31-
- name: 'Upload Kernel Artifact'
32-
uses: actions/upload-artifact@v4
33-
with:
34-
name: Kernel-ABI-s390
35-
path: "Module.symvers"

‎.github/workflows/build-kernel-sw64.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: build kernel sw64
2+
on:
3+
push:
4+
pull_request:
5+
workflow_dispatch:
6+
7+
env:
8+
KBUILD_BUILD_USER: deepin-kernel-sig
9+
KBUILD_BUILD_HOST: deepin-kernel-builder
10+
email: [email protected]
11+
12+
permissions:
13+
pull-requests: read
14+
15+
jobs:
16+
build-kernel-sw6b:
17+
runs-on: [self-hosted, linux, x64]
18+
steps:
19+
- uses: actions/checkout@v3
20+
- name: "Install Deps"
21+
run: |
22+
git config --global user.email $email
23+
git config --global user.name $KBUILD_BUILD_USER
24+
25+
- name: "Compile kernel"
26+
run: |
27+
# .config
28+
time swmk1230 xuelang_defconfig
29+
time swmk1230 -j`nproc`
30+
31+
build-kernel-sw8a:
32+
runs-on: [self-hosted, linux, x64]
33+
steps:
34+
- name: "Compile kernel"
35+
run: |
36+
# .config
37+
time swmk8a1230 junzhang_defconfig
38+
time swmk8a1230 -j`nproc`

‎.github/workflows/build-kernel.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ jobs:
2828
make deepin_x86_desktop_defconfig
2929
make -j$(nproc)
3030
31-
- name: 'Upload Kernel Artifact'
32-
uses: actions/upload-artifact@v4
33-
with:
34-
name: Kernel-ABI-x86-64
35-
path: "Module.symvers"
36-
3731
- name: "Clang build kernel"
3832
run: |
3933
# .config

‎Documentation/ABI/testing/sysfs-devices-system-cpu‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,9 @@ What: /sys/devices/system/cpu/vulnerabilities
526526
/sys/devices/system/cpu/vulnerabilities/spectre_v1
527527
/sys/devices/system/cpu/vulnerabilities/spectre_v2
528528
/sys/devices/system/cpu/vulnerabilities/srbds
529+
/sys/devices/system/cpu/vulnerabilities/tsa
529530
/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
531+
/sys/devices/system/cpu/vulnerabilities/vmscape
530532
Date: January 2018
531533
Contact: Linux kernel mailing list <[email protected]>
532534
Description: Information about CPU vulnerabilities

‎Documentation/ABI/testing/sysfs-driver-ufs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ Description: This file shows the thin provisioning type. This is one of
711711

712712
The file is read only.
713713

714-
What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resourse_count
714+
What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resource_count
715715
Date: February 2018
716716
Contact: Stanislav Nijnikov <[email protected]>
717717
Description: This file shows the total physical memory resources. This is

‎Documentation/admin-guide/cgroup-v1/memory.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,9 @@ the amount of kernel memory used by the system. Kernel memory is fundamentally
320320
different than user memory, since it can't be swapped out, which makes it
321321
possible to DoS the system by consuming too much of this precious resource.
322322

323-
Kernel memory accounting is enabled for all memory cgroups by default. But
324-
it can be disabled system-wide by passing cgroup.memory=nokmem to the kernel
325-
at boot time. In this case, kernel memory will not be accounted at all.
323+
Kernel memory accounting is disabled for all memory cgroups by default. But
324+
it can be enabled system-wide by passing cgroup.memory=kmem to the kernel
325+
at boot time. In this case, kernel memory will all be accounted.
326326

327327
Kernel memory limits are not imposed for the root cgroup. Usage for the root
328328
cgroup may or may not be accounted. The memory used is accumulated into

‎Documentation/admin-guide/hw-vuln/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ are configurable at compile, boot or run time.
2323
gather_data_sampling
2424
reg-file-data-sampling
2525
indirect-target-selection
26+
vmscape

0 commit comments

Comments
 (0)