diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67b1051a5cff6a..32de65d42ced69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - arch: [x86_64, arm64, riscv, loongarch, arm] + arch: [x86_64, arm64, riscv, arm] # loongarch config: [generic.config] bindgen: [latest] rustc: [stable] @@ -26,7 +26,7 @@ jobs: - arch: x86_64 config: generic.config bindgen: latest - rustc: 1.78.0 + rustc: 1.85.0 - arch: x86_64 config: generic.config bindgen: latest diff --git a/configs/gcc/generic.config b/configs/gcc/generic.config index 15b4567debbc06..473e9a69d408b8 100644 --- a/configs/gcc/generic.config +++ b/configs/gcc/generic.config @@ -1,4 +1,5 @@ CONFIG_PCI=y +CONFIG_NET=y CONFIG_COMPAT=y CONFIG_JUMP_LABEL=y CONFIG_KUNIT=y diff --git a/configs/generic.config b/configs/generic.config index 87637b00bf4cc7..b1daf805a30f67 100644 --- a/configs/generic.config +++ b/configs/generic.config @@ -1,4 +1,5 @@ CONFIG_ANDROID_BINDER_IPC_RUST=y +CONFIG_NET=y CONFIG_PCI=y CONFIG_COMPAT=y diff --git a/linux b/linux index 478da47ff04554..cd423e4ec3d132 160000 --- a/linux +++ b/linux @@ -1 +1 @@ -Subproject commit 478da47ff04554380d0e5367fd613263b645a1de +Subproject commit cd423e4ec3d13286026122b577a989f3ae706a0a