Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86/cache updates from Thomas Gleixner:
 "A set of patches which add support for L2 cache partitioning to the
  Intel RDT facility"

* 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel_rdt: Add command line parameter to control L2_CDP
  x86/intel_rdt: Enable L2 CDP in MSR IA32_L2_QOS_CFG
  x86/intel_rdt: Add two new resources for L2 Code and Data Prioritization (CDP)
  x86/intel_rdt: Enumerate L2 Code and Data Prioritization (CDP) feature
  x86/intel_rdt: Add L2CDP support in documentation
  x86/intel_rdt: Update documentation

diff --combined Documentation/admin-guide/kernel-parameters.txt
index 1bdcf572c2ac7065102a4b8a8e8f7cd95d6433ed,fde058ca8419c4756621980c04787a4193b68e77..f73bd08a59ad8451d875823fd28abaef60b97872
--- 1/Documentation/admin-guide/kernel-parameters.txt
--- 2/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -114,6 -114,7 +114,6 @@@
                        This facility can be used to prevent such uncontrolled
                        GPE floodings.
                        Format: <int>
 -                      Support masking of GPEs numbered from 0x00 to 0x7f.
  
        acpi_no_auto_serialize  [HW,ACPI]
                        Disable auto-serialization of AML methods
@@@ -222,7 -223,7 +222,7 @@@
  
        acpi_sleep=     [HW,ACPI] Sleep options
                        Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,
 -                                old_ordering, nonvs, sci_force_enable }
 +                                old_ordering, nonvs, sci_force_enable, nobl }
                        See Documentation/power/video.txt for information on
                        s3_bios and s3_mode.
                        s3_beep is for debugging; it makes the PC's speaker beep
@@@ -238,9 -239,6 +238,9 @@@
                        sci_force_enable causes the kernel to set SCI_EN directly
                        on resume from S1/S3 (which is against the ACPI spec,
                        but some broken systems don't work without it).
 +                      nobl causes the internal blacklist of systems known to
 +                      behave incorrectly in some ways with respect to system
 +                      suspend and resume to be ignored (use wisely).
  
        acpi_use_timer_override [HW,ACPI]
                        Use timer override. For some broken Nvidia NF5 boards
@@@ -3684,7 -3682,8 +3684,8 @@@
  
        rdt=            [HW,X86,RDT]
                        Turn on/off individual RDT features. List is:
-                       cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, mba.
+                       cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp,
+                       mba.
                        E.g. to turn on cmt and turn off mba use:
                                rdt=cmt,!mba