resolved conflicts

Author: theonlytruealex

boards/configurations/nrf52840dk/nrf52840dk-test-kernel/src/test/aes_test.rs

@@ -29,7 +29,7 @@ use capsules_core::test::capsule_test::{CapsuleTest, CapsuleTestClient};
 use capsules_extra::test::aes::TestAes128Cbc;
 use capsules_extra::test::aes::TestAes128Ctr;
 use capsules_extra::test::aes::TestAes128Ecb;
-use kernel::hil::symmetric_encryption::{AES, AES128_KEY_SIZE, AES_BLOCK_SIZE};
+use kernel::hil::symmetric_encryption::{AES, AES_BLOCK_SIZE, AES128_KEY_SIZE};
 use kernel::static_init;
 use nrf52840::aes::AesECB;
 

boards/imix/src/test/aes_test.rs

@@ -27,7 +27,7 @@
 
 use capsules_extra::test::aes::TestAes128Cbc;
 use capsules_extra::test::aes::TestAes128Ctr;
-use kernel::hil::symmetric_encryption::{AES, AES128_KEY_SIZE, AES_BLOCK_SIZE};
+use kernel::hil::symmetric_encryption::{AES, AES_BLOCK_SIZE, AES128_KEY_SIZE};
 use kernel::static_init;
 use sam4l::aes::Aes;
 

boards/nordic/nrf52dk/src/tests/aes.rs

@@ -3,7 +3,7 @@
 // Copyright Tock Contributors 2022.
 
 use capsules_extra::test::aes::TestAes128Ctr;
-use kernel::hil::symmetric_encryption::{AES, AES128_KEY_SIZE, AES_BLOCK_SIZE};
+use kernel::hil::symmetric_encryption::{AES, AES_BLOCK_SIZE, AES128_KEY_SIZE};
 use kernel::static_init;
 use nrf52832::aes::AesECB;
 

boards/opentitan/earlgrey-cw310/src/main.rs

@@ -30,7 +30,7 @@ use kernel::hil::hasher::Hasher;
 use kernel::hil::i2c::I2CMaster;
 use kernel::hil::led::LedHigh;
 use kernel::hil::rng::Rng;
-use kernel::hil::symmetric_encryption::{AES, AES128, AES_BLOCK_SIZE};
+use kernel::hil::symmetric_encryption::{AES, AES_BLOCK_SIZE, AES128};
 use kernel::platform::{KernelResources, SyscallDriverLookup};
 use kernel::utilities::registers::interfaces::ReadWriteable;
 use kernel::utilities::single_thread_value::SingleThreadValue;

boards/opentitan/earlgrey-cw310/src/tests/aes_test.rs

@@ -13,7 +13,7 @@ use capsules_extra::test::aes_ccm;
 use capsules_extra::test::aes_gcm;
 use earlgrey::aes::Aes;
 use kernel::debug;
-use kernel::hil::symmetric_encryption::{AES128_KEY_SIZE, AES_BLOCK_SIZE};
+use kernel::hil::symmetric_encryption::{AES_BLOCK_SIZE, AES128_KEY_SIZE};
 use kernel::static_init;
 
 /// The only 'test_case' for aes_test as directly invoked by the test runner,

chips/earlgrey/src/aes.rs

@@ -13,6 +13,7 @@ use kernel::deferred_call::{DeferredCall, DeferredCallClient};
 use kernel::hil;
 use kernel::hil::symmetric_encryption;
 use kernel::hil::symmetric_encryption::{AES_BLOCK_SIZE, AES128, AES128_KEY_SIZE};
+use kernel::utilities::StaticRef;
 use kernel::utilities::cells::{OptionalCell, TakeCell};
 use kernel::utilities::registers::interfaces::{Readable, Writeable};
 use kernel::utilities::registers::{

chips/sam4l/src/aes.rs

@@ -19,6 +19,7 @@ use kernel::ErrorCode;
 use kernel::debug;
 use kernel::hil;
 use kernel::hil::symmetric_encryption::{AES_BLOCK_SIZE, AES128, AES128_KEY_SIZE};
+use kernel::utilities::StaticRef;
 use kernel::utilities::cells::{OptionalCell, TakeCell};
 use kernel::utilities::registers::interfaces::{Readable, Writeable};
 use kernel::utilities::registers::{ReadOnly, ReadWrite, WriteOnly, register_bitfields};