If you are a Linux kernel developer and git user, watch this demonstration by Vegard Nossum, Consulting Developer at Oracle, to learn how to backport patches from mainline Linux kernel and how to do conflict resolution.
00:00 - Introduction
00:18 - KVM: x86/mmu: fix NULL pointer dereference on guest INVPCID
12:38 - exec: Force single empty string when argv is empty