On further consideration and some offline chats, I believe this large change is a bit too late for 6.6. I think this should wait for 6.7 (and stable), hopefully preserving non-root access in some sane capacity. It's backed out now, and current nvme-6.6 PR does not include this patch.
