diff --git a/.github/workflows/push-check_aarch64.yml b/.github/workflows/build-check_aarch64.yml
similarity index 87%
rename from .github/workflows/push-check_aarch64.yml
rename to .github/workflows/build-check_aarch64.yml
index de372fd5ce48b..9bcb0587db44c 100644
--- a/.github/workflows/push-check_aarch64.yml
+++ b/.github/workflows/build-check_aarch64.yml
@@ -1,6 +1,6 @@
-name: CI
+name: aarch64 CI
 on:
-  push:
+  pull_request:
     branches:
       - '**'
       - '!mainline'
@@ -24,10 +24,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          ref: "${{ github.event.pull_request.head.sha }}"
           fetch-depth: 0
       - name: Build the Kernel
         run: |
-          git config --global --add safe.directory /__w/kernel-src-git/kernel-src-git
+          git config --global --add safe.directory /__w/kernel-src-tree/kernel-src-tree
           cp configs/kernel-5.14.0-aarch64.config .config
           make olddefconfig
           make -j8
diff --git a/.github/workflows/push-check_x86_64.yml b/.github/workflows/build-check_x86_64.yml
similarity index 87%
rename from .github/workflows/push-check_x86_64.yml
rename to .github/workflows/build-check_x86_64.yml
index 28a9ed0ee219c..2bf53a9f70f6e 100644
--- a/.github/workflows/push-check_x86_64.yml
+++ b/.github/workflows/build-check_x86_64.yml
@@ -1,6 +1,6 @@
-name: CI
+name: x86_64 CI
 on:
-  push:
+  pull_request:
     branches:
       - '**'
       - '!mainline'
@@ -24,10 +24,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          ref: "${{ github.event.pull_request.head.sha }}"
           fetch-depth: 0
       - name: Build the Kernel
         run: |
-          git config --global --add safe.directory /__w/kernel-src-git/kernel-src-git
+          git config --global --add safe.directory /__w/kernel-src-tree/kernel-src-tree
           cp configs/kernel-5.14.0-x86_64.config .config
           make olddefconfig
           make -j8
diff --git a/.github/workflows/process-pull-request.yml b/.github/workflows/process-pull-request.yml
deleted file mode 100644
index 5764537bed632..0000000000000
--- a/.github/workflows/process-pull-request.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Pull Request Checker
-
-on:
-  pull_request:
-    branches:
-      - '**'
-      - '!mainline'    
-
-permissions:
-  contents: read
-
-jobs:
-  test:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: ['3.0']
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-      uses: ruby/setup-ruby@v1
-    # uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Set up Python
-      uses: actions/setup-python@v5
-    - name: Run tests
-      run: |
-        /usr/bin/pip3 install gitPython
-        python -c "import sys; import git; print(sys.version)"
-        git fetch origin ${{ github.base_ref }}
-        git fetch origin ${{ github.head_ref }}
-        git remote add linux https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
-        git fetch --shallow-since="3 years ago" linux
-        echo "Will run process-git-request.rb with:"
-        echo "fname = ${{ github.run_id }}"
-        echo "target_branch = ${{ github.base_ref }}"
-        echo "source_branch = ${{ github.head_ref }}"
-        echo "prj_dir = ${{ github.workspace }}"
-        echo "pull_request = ${{ github.ref }}"
-        echo "requestor = ${{ github.actor }}"
-        cd ${{ github.workspace }}
-        /usr/bin/ruby .github/workflows/process-git-request.rb ${{ github.run_id }} ${{ github.base_ref }} \
-        ${{ github.head_ref }} ${{ github.workspace }} ${{ github.ref }} ${{ github.actor }} 
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index cc4f3f7a4c536..dd037c78c93bd 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1984,7 +1984,7 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm,
 		if (link_type == LE_LINK && c->src_type == BDADDR_BREDR)
 			continue;
 
-		if (c->psm == psm) {
+		if (c->chan_type != L2CAP_CHAN_FIXED && c->psm == psm) {
 			int src_match, dst_match;
 			int src_any, dst_any;