Messages in this thread | | | Subject | Re: [PATCH v17 00/10] Carry forward IMA measurement log on kexec on ARM64 | From | Lakshmi Ramasubramanian <> | Date | Wed, 10 Feb 2021 14:34:57 -0800 |
| |
On 2/10/21 1:39 PM, Mimi Zohar wrote: > On Wed, 2021-02-10 at 15:55 -0500, Mimi Zohar wrote: >> On Wed, 2021-02-10 at 14:42 -0600, Rob Herring wrote: >>> On Wed, Feb 10, 2021 at 11:33 AM Lakshmi Ramasubramanian >> >>> Ideally, we don't apply the same patch in 2 branches. It looks like >>> there's a conflict but no real dependence on the above patch (the >>> ima_buffer part). The conflict seems trivial enough that Linus can >>> resolve it in the merge window. >>> >>> Or Mimi can take the whole thing if preferred? >> >> How about I create a topic branch with just the two patches, allowing >> both of us to merge it? There shouldn't be a problem with re-writing >> next-integrity history. > > The 2 patches are now in the ima-kexec-fixes branch. >
Thanks a lot Mimi.
Rob - I will address the 2 comments you'd provided today, and build the patches in ima-kexec-fixes branch.
If you have more comments in the v17 patches, please let me know.
thanks, -lakshmi
| |