summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'libnvdimm-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2015-09-0826-191/+197
|\
| * x86, pmem: clarify that ARCH_HAS_PMEM_API implies PMEM mapped WBDan Williams2015-08-272-9/+2
| * mm: ZONE_DEVICE for "device memory"Dan Williams2015-08-277-12/+13
| * mm: move __phys_to_pfn and __pfn_to_phys to asm/generic/memory_model.hChristoph Hellwig2015-08-273-18/+0
| * dax: drop size parameter to ->direct_access()Dan Williams2015-08-271-1/+1
| * Merge branch 'pmem-api' into libnvdimm-for-nextDan Williams2015-08-2713-86/+175
| |\
| | * nd_blk: change aperture mapping from WC to WBRoss Zwisler2015-08-274-2/+5
| | * pmem, dax: have direct_access use __pmem annotationRoss Zwisler2015-08-201-3/+4
| | * pmem: add copy_from_iter_pmem() and clear_pmem()Ross Zwisler2015-08-201-0/+75
| | * pmem, x86: clean up conditional pmem includesRoss Zwisler2015-08-201-11/+2
| | * pmem: remove layer when calling arch_has_wmb_pmem()Ross Zwisler2015-08-201-1/+1
| | * pmem, x86: move x86 PMEM API to new pmem.h headerRoss Zwisler2015-08-202-71/+92
| | * pmem: convert to generic memremapDan Williams2015-08-141-5/+1
| | * arch: introduce memremap()Dan Williams2015-08-143-0/+3
| | * cleanup IORESOURCE_CACHEABLE vs ioremap()Dan Williams2015-08-103-4/+3
| | * arch, drivers: don't include <asm/io.h> directly, use <linux/io.h> insteadDan Williams2015-08-102-2/+2
| * | libnvdimm, e820: make CONFIG_X86_PMEM_LEGACY a tristate optionDan Williams2015-08-194-74/+15
| |/
* | Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...Linus Torvalds2015-09-081-4/+4
|\ \
| * | kbuild: Fix clang detectionMichal Marek2015-09-041-4/+4
* | | Merge tag 'trace-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...Linus Torvalds2015-09-086-7/+7
|\ \ \
| * | | ftrace: Format MCOUNT_ADDR address as type unsigned longMinfei Huang2015-07-206-7/+7
* | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2015-09-082-2/+3
|\ \ \ \
| * | | | PKCS#7: Appropriately restrict authenticated attributes and content typeDavid Howells2015-08-121-1/+3
| * | | | Yama: remove needless CONFIG_SECURITY_YAMA_STACKEDKees Cook2015-07-281-1/+0
| |/ / /
* | | | Merge branch 'nmi' of git://ftp.arm.linux.org.uk/~rmk/linux-armLinus Torvalds2015-09-083-129/+27
|\ \ \ \
| * | | | ARM: add basic support for on-demand backtrace of other CPUsRussell King2015-07-172-0/+23
| * | | | nmi: x86: convert to generic nmi handlerRussell King2015-07-171-129/+4
| | |/ / | |/| |
* | | | Merge tag 'for-linus-4.3-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2015-09-0823-250/+1679
|\ \ \ \
| * | | | xen: switch extra memory accounting to use pfnsJuergen Gross2015-09-081-36/+44
| * | | | xen: limit memory to architectural maximumJuergen Gross2015-09-081-1/+1
| * | | | xen: avoid another early crash of memory limited dom0Juergen Gross2015-09-081-8/+15
| * | | | xen: avoid early crash of memory limited dom0Juergen Gross2015-09-081-3/+4
| * | | | arm/xen: Remove helpers which are PV specificJulien Grall2015-08-201-14/+2
| * | | | xen/x86: Don't try to set PCE bit in CR4Boris Ostrovsky2015-08-201-2/+1
| * | | | xen/PMU: PMU emulation codeBoris Ostrovsky2015-08-201-29/+185
| * | | | xen/PMU: Intercept PMU-related MSR and APIC accessesBoris Ostrovsky2015-08-204-8/+107
| * | | | xen/PMU: Describe vendor-specific PMU registersBoris Ostrovsky2015-08-201-1/+152
| * | | | xen/PMU: Initialization code for Xen PMUBoris Ostrovsky2015-08-208-9/+364
| * | | | xen/PMU: Sysfs interface for setting Xen PMU modeBoris Ostrovsky2015-08-202-0/+7
| * | | | xen: remove no longer needed p2m.hJuergen Gross2015-08-204-19/+9
| * | | | xen: allow more than 512 GB of RAM for 64 bit pv-domainsJuergen Gross2015-08-204-27/+66
| * | | | xen: move p2m list if conflicting with e820 mapJuergen Gross2015-08-203-47/+264
| * | | | xen: add explicit memblock_reserve() calls for special pagesJuergen Gross2015-08-203-1/+19
| * | | | xen: check for initrd conflicting with e820 mapJuergen Gross2015-08-201-0/+51
| * | | | xen: check pre-allocated page tables for conflict with memory mapJuergen Gross2015-08-203-3/+23
| * | | | xen: check for kernel memory conflicting with memory layoutJuergen Gross2015-08-201-0/+12
| * | | | xen: find unused contiguous memory areaJuergen Gross2015-08-202-0/+35
| * | | | xen: check memory area against e820 mapJuergen Gross2015-08-202-0/+24
| * | | | xen: split counting of extra memory pages from remappingJuergen Gross2015-08-201-40/+58
| * | | | xen: move static e820 map to global scopeJuergen Gross2015-08-201-47/+49