Note that the following bunch of patches had lots of conflicts
* x86/cpufeature, x86/mm/pkeys: Add protection keys related CPUID definitions * x86/mm/pkeys: Fix mismerge of protection keys CPUID bits * x86/cpu: Add detection of AMD RAS Capabilities * x86/cpufeature, x86/mm/pkeys: Fix broken compile-time disabling of pkeys * x86/cpufeature: Make sure DISABLED/REQUIRED macros are updated most of them due to conflicting with "d8d8ad461662b UBUNTU: SAUCE: x86/cpufeatures: Move CPUID_7_EDX CPUID bits to word 18". I think I resolved them correctly but an extra set of eyes might be good. Furthermore, there was another conflict with: * loop: add recursion validation to LOOP_CHANGE_FD due to conflicting with "dee5220cf5 UBUNTU: SAUCE: AUFS ". In the function loop_set_fd() the upstream patch tries to remove the local variable 'f' with the AUFS code appears to be using. I kept 'f' The following upstream patches were skipped because they were either already applied or their code was somehow already present: e71dbad7563d Fix up non-directory creation in SGID directories 47ff5bc938c8 x86/cpufeature: Move some of the scattered feature bits to x86_capability 0f66fae5d614 x86/cpufeature: Cleanup get_cpu_cap() 7b2330a33983 x86/cpufeature: Carve out X86_FEATURE_* febdf817e79b x86/cpufeature: Update cpufeaure macros -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1784543 Title: Xenial update to 4.4.141 stable release To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1784543/+subscriptions -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
