Resolve merge conflicts

core/src/serve_repair.rs

@@ -157,11 +157,7 @@ struct ServeRepairStats {
     highest_window_index: usize,
     orphan: usize,
     ancestor_hashes: usize,
-<<<<<<< HEAD
     pong: usize,
-    pings_required: usize,
-=======
->>>>>>> 206cc9407 (allow unsigned repair requests (#27910))
     err_time_skew: usize,
     err_malformed: usize,
     err_sig_verify: usize,
@@ -651,19 +647,7 @@ impl ServeRepair {
         _root_bank: &Bank,
         stats: &mut ServeRepairStats,
     ) {
-<<<<<<< HEAD
-        let sign_repairs_epoch = Self::sign_repair_requests_activated_epoch(root_bank);
-        let check_ping_ancestor_request_epoch =
-            Self::check_ping_ancestor_requests_activated_epoch(root_bank);
-        let (identity_keypair, socket_addr_space) = {
-            let me_r = me.read().unwrap();
-            let keypair = me_r.cluster_info.keypair().clone();
-            let socket_addr_space = *me_r.cluster_info.socket_addr_space();
-            (keypair, socket_addr_space)
-        };
-=======
         let identity_keypair = self.cluster_info.keypair().clone();
->>>>>>> 206cc9407 (allow unsigned repair requests (#27910))
         let my_id = identity_keypair.pubkey();
 
         // iter over the packets

sdk/src/feature_set.rs

@@ -415,8 +415,6 @@ pub mod sign_repair_requests {
     solana_sdk::declare_id!("sigrs6u1EWeHuoKFkY8RR7qcSsPmrAeBBPESyf5pnYe");
 }
 
-<<<<<<< HEAD
-=======
 pub mod incremental_snapshot_only_incremental_hash_calculation {
     solana_sdk::declare_id!("25vqsfjk7Nv1prsQJmA4Xu1bN61s8LXCBGUPp8Rfy1UF");
 }
@@ -441,15 +439,10 @@ pub mod cap_accounts_data_allocations_per_transaction {
     solana_sdk::declare_id!("9gxu85LYRAcZL38We8MYJ4A9AwgBBPtVBAqebMcT1241");
 }
 
->>>>>>> 206cc9407 (allow unsigned repair requests (#27910))
 pub mod return_none_for_zero_lamport_accounts {
     solana_sdk::declare_id!("7K5HFrS1WAq6ND7RQbShXZXbtAookyTfaDQPTJNuZpze");
 }
 
-pub mod check_ping_ancestor_requests {
-    solana_sdk::declare_id!("AXLB87anNaUQtqBSsxkm4gvNzYY985aLtNtpJC94uWLJ");
-}
-
 pub mod increase_tx_account_lock_limit {
     solana_sdk::declare_id!("9LZdXeKGeBV6hRLdxS1rHbHoEUsKqesCC2ZAPTPKJAbK");
 }
@@ -552,16 +545,12 @@ lazy_static! {
         (preserve_rent_epoch_for_rent_exempt_accounts::id(), "preserve rent epoch for rent exempt accounts #26479"),
         (prevent_crediting_accounts_that_end_rent_paying::id(), "prevent crediting rent paying accounts #26606"),
         (sign_repair_requests::id(), "sign repair requests #26834"),
-<<<<<<< HEAD
-        (check_ping_ancestor_requests::id(), "ancestor hash repair socket ping/pong support #26963"),
-=======
         (incremental_snapshot_only_incremental_hash_calculation::id(), "only hash accounts in incremental snapshot during incremental snapshot creation #26799"),
         (disable_cpi_setting_executable_and_rent_epoch::id(), "disable setting is_executable and_rent_epoch in CPI #26987"),
         (relax_authority_signer_check_for_lookup_table_creation::id(), "relax authority signer check for lookup table creation #27205"),
         (stop_sibling_instruction_search_at_parent::id(), "stop the search in get_processed_sibling_instruction when the parent instruction is reached #27289"),
         (vote_state_update_root_fix::id(), "fix root in vote state updates #27361"),
         (cap_accounts_data_allocations_per_transaction::id(), "cap accounts data allocations per transaction #27375"),
->>>>>>> 206cc9407 (allow unsigned repair requests (#27910))
         (return_none_for_zero_lamport_accounts::id(), "return none for zero lamport accounts #27800"),
         (increase_tx_account_lock_limit::id(), "increase tx account lock limit to 128 #27241"),
         /*************** ADD NEW FEATURES HERE ***************/