* Force a recent version of the openssl crate to allow this to build on M1 macs (cherry picked from commit920159fc63
) # Conflicts: # Cargo.lock # programs/bpf_loader/Cargo.toml * Run cargo check (cherry picked from commit8efc577374
) # Conflicts: # programs/bpf/Cargo.lock * Resolve merge conflicts Co-authored-by: Matt Wilde <matthewcwilde@gmail.com> Co-authored-by: Michael Vines <mvines@gmail.com>