Removing the changes from the stable branch that aren't in the unstable branch

Author: Patchoulis

.github/mergify.yml

@@ -1,37 +1,3 @@
-pull_request_rules:
-  - name: Ask to resolve conflict
-    conditions:
-      - conflict
-      - -author=dependabot[bot]
-      - or:
-          - -draft # Don't report conflicts on regular draft.
-          - and: # Do report conflicts on draft that are scheduled for the next major release.
-              - draft
-              - milestone~=v[0-9]\.[0-9]{2}
-    actions:
-      comment:
-        message: This pull request has merge conflicts. Could you please resolve them
-          @{{author}}? 🙏
-
-  - name: Approve trivial maintainer PRs
-    conditions:
-      - base!=stable
-      - label=trivial
-      - author=@sigp/lighthouse
-      - -conflict
-    actions:
-      review:
-        type: APPROVE
-
-  - name: Add ready-to-merge labeled PRs to merge queue
-    conditions:
-      # All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
-      - base!=stable
-      - label=ready-for-merge
-      - label!=do-not-merge
-    actions:
-      queue:
-
 queue_rules:
   - name: default
     batch_size: 8
@@ -40,16 +6,14 @@ queue_rules:
     merge_method: squash
     commit_message_template: |
       {{ title }} (#{{ number }})
-
-        {{ body | get_section("## Issue Addressed", "") }}
-
-
-        {{ body | get_section("## Proposed Changes", "") }}
+      
+      {% for commit in commits %}
+      * {{ commit.commit_message }}
+      {% endfor %}
     queue_conditions:
       - "#approved-reviews-by >= 1"
       - "check-success=license/cla"
       - "check-success=target-branch-check"
-      - "label!=do-not-merge"
     merge_conditions:
       - "check-success=test-suite-success"
-      - "check-success=local-testnet-success"
+      - "check-success=local-testnet-success"

beacon_node/lighthouse_network/src/peer_manager/peerdb.rs

@@ -240,7 +240,7 @@ impl<E: EthSpec> PeerDB<E> {
         if let Some(peer) = self.peers.get(peer_id) {
             Some(peer.get_penalty_records())
         } else {
-            error!(self.log, "Cannot get the penalty records of a non-existant peer"; "peer_id" => %peer_id);
+            error!(%peer_id, "Cannot get the penalty records of a non-existant peer");
             None
         }
     }
@@ -769,7 +769,7 @@ impl<E: EthSpec> PeerDB<E> {
 
     fn add_penalty_record(&mut self, peer_id: &PeerId, penalty_record: PenaltyRecord) {
         let info = self.peers.entry(*peer_id).or_insert_with(|| {
-            error!(self.log, "Adding a penalty record to a non-existant peer"; "peer_id" => %peer_id);
+            error!(%peer_id, "Adding a penalty record to a non-existant peer");
             if self.disable_peer_scoring {
                 PeerInfo::trusted_peer_info()
             } else {