Linus Torvalds aefbef10e3 Merge branch 'akpm' (patches from Andrew) ... Merge first patchbomb from Andrew Morton: - a few misc things - ocfs2 udpates - kernel/watchdog.c feature work (took ages to get right) - most of MM. A few tricky bits are held up and probably won't make 4.2. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (91 commits) mm: kmemleak_alloc_percpu() should follow the gfp from per_alloc() mm, thp: respect MPOL_PREFERRED policy with non-local node tmpfs: truncate prealloc blocks past i_size mm/memory hotplug: print the last vmemmap region at the end of hot add memory mm/mmap.c: optimization of do_mmap_pgoff function mm: kmemleak: optimise kmemleak_lock acquiring during kmemleak_scan mm: kmemleak: avoid deadlock on the kmemleak object insertion error path mm: kmemleak: do not acquire scan_mutex in kmemleak_do_cleanup() mm: kmemleak: fix delete_object_*() race when called on the same memory block mm: kmemleak: allow safe memory scanning during kmemleak disabling memcg: convert mem_cgroup->under_oom from atomic_t to int memcg: remove unused mem_cgroup->oom_wakeups frontswap: allow multiple backends x86, mirror: x86 enabling - find mirrored memory ranges mm/memblock: allocate boot time data structures from mirrored memory mm/memblock: add extra "flags" to memblock to allow selection of memory based on attribute mm: do not ignore mapping_gfp_mask in page cache allocation paths mm/cma.c: fix typos in comments mm/oom_kill.c: print points as unsigned int mm/hugetlb: handle races in alloc_huge_page and hugetlb_reserve_pages ...		2015-06-24 20:47:21 -07:00
..
ABI	Documentation updates for 4.2	2015-06-24 20:01:36 -07:00
DocBook	Documentation updates for 4.2	2015-06-24 20:01:36 -07:00
EDID	drm: Add 800x600 (SVGA) screen resolution to the built-in EDIDs	2014-05-26 12:53:40 +10:00
PCI	The documentation tree update for 4.1. Numerous fixes, the overdue removal	2015-04-18 11:10:49 -04:00
RCU	Documentation updates for 4.2	2015-06-24 20:01:36 -07:00
accounting	Documentation: use subdir-y to avoid unnecessary built-in.o files	2014-09-26 11:02:55 +02:00
acpi	ACPI: Constify ACPI device IDs in documentation	2015-06-19 01:14:15 +02:00
aoe	…
arm	Doc: Change wikipedia's URL from http to https	2015-06-22 10:14:05 -06:00
arm64	arm64: use fixmap region for permanent FDT mapping	2015-06-02 16:31:33 +01:00
auxdisplay	Documentation: use subdir-y to avoid unnecessary built-in.o files	2014-09-26 11:02:55 +02:00
backlight	…
blackfin	Docs: blackfin: Use new switch macro SAMPLE_IRQ_TIMER instead of IRQ_TIMER5	2015-05-07 09:35:14 -06:00
block	Documentation: Remove mentioning of block barriers	2015-03-20 07:41:56 -06:00
blockdev	Merge branch 'for-4.1/drivers' of git://git.kernel.dk/linux-block	2015-04-16 22:05:27 -04:00
bus-devices	…
cdrom	…
cgroups	The documentation tree update for 4.1. Numerous fixes, the overdue removal	2015-04-18 11:10:49 -04:00
cma	cma: debug: document new debugfs interface	2015-04-14 16:49:00 -07:00
connector	w1: optional bundling of netlink kernel replies	2014-05-27 13:56:21 -07:00
console	…
cpu-freq	Documentation updates for 4.2	2015-06-24 20:01:36 -07:00
cpuidle	…
cris	…
crypto	crypto: doc - AEAD / RNG AF_ALG interface	2015-03-09 21:06:18 +11:00
development-process	Documentation: remove outdated references to the linux-next wiki	2014-10-28 09:06:11 -04:00
device-mapper	dm crypt: update URLs to new cryptsetup project page	2015-04-15 12:10:24 -04:00
devicetree	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2015-06-24 19:56:58 -07:00
dmaengine	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2015-02-18 08:49:20 -08:00
driver-model	Char/Misc driver patches for 4.1-rc1	2015-04-21 09:42:58 -07:00
dvb	[media] get_dvb_firmware: Update firmware of ITEtech IT9135	2014-09-21 17:03:04 -03:00
early-userspace	…
extcon	…
fault-injection	…
fb	doc: spelling error changes	2014-05-05 15:32:05 +02:00
features	Documentation/features: Explain kernel feature descriptions and add visualization script	2015-06-03 12:59:38 +02:00
filesystems	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs	2015-06-24 20:07:10 -07:00
firmware_class	doc: fix minor typos in firmware_class README	2014-07-17 18:43:40 -07:00
fmc	FMC: make eeprom attribute writable	2014-02-28 15:12:08 -08:00
frv	…
gpio	Documentation updates for 4.2	2015-06-24 20:01:36 -07:00
hid	HID: sensor: Update document for custom sensor	2015-04-10 22:22:56 +02:00
hwmon	hwmon: add driver for Microchip TC74	2015-06-21 22:54:53 -07:00
i2c	i2c: slave: fix the example how to instantiate from userspace	2015-06-17 14:16:27 +02:00
ia64	virtual: Documentation: simplify and generalize paravirt_ops.txt	2015-02-13 17:15:44 +10:30
ide	Documentation/: update 00-INDEX files	2014-02-10 16:01:40 -08:00
infiniband	IB/mad: add new ioctl to ABI to support new registration options	2014-08-10 20:36:00 -07:00
input	Doc: Change wikipedia's URL from http to https	2015-06-22 10:14:05 -06:00
ioctl	platform/chrome: Add Chrome OS EC userspace device interface	2015-02-26 15:45:06 -08:00
isdn	…
ja_JP	Doc: ja_JP: Fix typo in HOWTO	2015-06-08 16:43:09 -06:00
kbuild	kbuild : Fix documentation of INSTALL_HDR_PATH	2015-06-22 09:56:07 -06:00
kdump	kernel: add panic_on_warn	2014-12-10 17:41:10 -08:00
ko_KR	…
laptops	Move freefall program from Documentation/ to tools/	2015-06-08 16:42:07 -06:00
leds	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2015-06-24 19:56:58 -07:00
locking	Documentation changes for 3.20	2015-02-11 13:03:11 -08:00
m68k	Documentation/: update 00-INDEX files	2014-02-10 16:01:40 -08:00
memory-devices	…
metag	…
mic	Documentation/mic/mpssd: don't build x86 userspace when cross compiling	2015-06-22 16:05:11 -06:00
mips	Documentation: au1xxx-ide.c has moved	2014-08-26 09:35:53 +02:00
misc-devices	Documentation/misc-devices/mei: Fix indentation of embedded code.	2015-01-29 12:56:20 -07:00
mmc	…
mn10300	…
mtd	MTD updates for 3.16:	2014-06-11 08:35:34 -07:00
namespaces	…
netlabel	…
networking	Documentation updates for 4.2	2015-06-24 20:01:36 -07:00
nfc	NFC: Fix typo in nfc-hci.txt	2015-06-08 23:15:45 +02:00
nios2	Documentation: Add documentation for Nios2 architecture	2014-12-08 12:56:06 +08:00
parisc	…
pcmcia	Documentation: use subdir-y to avoid unnecessary built-in.o files	2014-09-26 11:02:55 +02:00
phy	phy: Add new Exynos USB 2.0 PHY driver	2014-03-08 12:39:44 +05:30
platform	Documentation: Add list of laptop models supported by the Compal driver	2014-06-10 19:11:06 -04:00
power	PM / runtime: add note about re-calling in during device probe()	2015-05-13 00:02:38 +02:00
powerpc	powerpc/tm: Abort syscalls in active transactions	2015-06-19 17:10:28 +10:00
pps	Doc:pps: Fix typo in pps.txt	2015-06-22 09:59:28 -06:00
prctl	Documentation/prctl: don't build tsc tests when cross compiling	2015-06-22 16:05:04 -06:00
pti	…
ptp	ptp: restore the makefile for building the test program.	2014-10-24 16:07:10 -04:00
rapidio	rapidio/tsi721_dma: rework scatter-gather list handling	2014-08-08 15:57:24 -07:00
s390	qeth: OSA version of SETBRIDGEPORT command	2015-05-18 12:14:17 -04:00
scheduler	sched/dl/Documentation: Split Section 3	2015-05-19 08:39:21 +02:00
scsi	st: implement tape statistics	2015-06-02 08:03:25 -07:00
security	Smack: Updates for Smack documentation	2015-03-31 10:35:31 -07:00
serial	pty: Fix input race when closing	2015-05-10 19:26:37 +02:00
sh	…
sound	ASoC: Updates for v4.1	2015-04-13 14:14:29 +02:00
spi	Documentation/spi/spidev_test.c: fix warning	2015-04-17 09:04:12 -04:00
sysctl	watchdog: add watchdog_cpumask sysctl to assist nohz	2015-06-24 17:49:40 -07:00
target	SCSI misc on 20150622	2015-06-23 15:55:44 -07:00
thermal	Documentation: thermal: document of_cpufreq_cooling_register()	2015-01-06 14:39:17 -04:00
timers	documentation: Update NO_HZ_FULL interaction with POSIX timers	2015-02-26 11:57:29 -08:00
tpm	…
trace	Documentation: tracing: fix grammar	2015-05-13 15:39:04 -04:00
usb	Documentation usb serial: fixed how to provide vendor and product id	2015-05-07 09:44:04 -06:00
vDSO	Documentation/vDSO: don't build tests when cross compiling	2015-06-22 16:04:57 -06:00
video4linux	[media] media/Documentation: New flag EXECUTE_ON_WRITE	2015-04-08 06:35:16 -03:00
virtual	KVM: x86: mark legacy PCI device assignment as deprecated	2015-06-05 17:26:39 +02:00
vm	Documentation/vm/unevictable-lru.txt: clarify MAP_LOCKED behavior	2015-06-24 17:49:44 -07:00
w1	w1: new w1_ds2406 driver	2014-06-19 17:45:14 -07:00
watchdog	Documentation: use subdir-y to avoid unnecessary built-in.o files	2014-09-26 11:02:55 +02:00
wimax	…
x86	Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-06-22 17:59:09 -07:00
xtensa	…
zh_CN	Documentation updates for 4.2	2015-06-24 20:01:36 -07:00
00-INDEX	Update of Documentation/dmaengine/00-INDEX	2014-12-29 15:28:24 -07:00
BUG-HUNTING	…
Changes	Documentation: GNU is frequently spelled Gnu	2014-12-29 15:33:17 -07:00
CodeOfConflict	Code of Conflict	2015-02-27 11:44:24 -08:00
CodingStyle	Documentation/CodingStyle: fix example macro parenthesis imbalance	2015-05-07 17:07:41 -06:00
DMA-API-HOWTO.txt	Documentation updates for 4.2	2015-06-24 20:01:36 -07:00
DMA-API.txt	PCI: Add pci_bus_addr_t	2015-05-29 17:21:45 -05:00
DMA-ISA-LPC.txt	DMA-API: Clarify physical/bus address distinction	2014-05-20 16:54:21 -06:00
DMA-attributes.txt	doc: spelling error changes	2014-05-05 15:32:05 +02:00
HOWTO	Documentation: remove outdated references to the linux-next wiki	2014-10-28 09:06:11 -04:00
IPMI.txt	ipmi:ssif: Ignore spaces when comparing I2C adapter names	2015-05-05 14:24:45 -05:00
IRQ-affinity.txt	…
IRQ-domain.txt	IRQCHIP: Update docs regarding irq_domain_add_tree()	2015-04-01 17:21:35 +02:00
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	Documentation: Remove ZBOOT MMC/SDHI utility and docs	2015-02-24 06:45:25 +09:00
ManagementStyle	…
SAK.txt	…
SM501.txt	…
SecurityBugs	…
SubmitChecklist	…
SubmittingDrivers	doc: SubmittingPatches: remove dead link, kerneltrap.org no longer works	2014-06-19 15:15:27 +02:00
SubmittingPatches	SubmittingPatches: Clarify requirements for patches directed toward stable	2015-05-14 15:34:52 -04:00
VGA-softcursor.txt	…
applying-patches.txt	Documentation: change "&" to "and" in Documentation/applying-patches.txt	2014-09-26 11:10:11 +02:00
assoc_array.txt	…
atomic_ops.txt	documentation: Clarify memory-barrier semantics of atomic operations	2015-02-26 11:57:31 -08:00
bad_memory.txt	…
basic_profiling.txt	…
bcache.txt	…
binfmt_misc.txt	binfmt_misc: touch up documentation a bit	2014-10-14 02:18:16 +02:00
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
bus-virt-phys-mapping.txt	…
cachetlb.txt	rmap: drop support of non-linear mappings	2015-02-10 14:30:31 -08:00
circular-buffers.txt	…
clk.txt	clk: Add rate constraints to clocks	2015-02-02 14:23:42 -08:00
coccinelle.txt	…
cpu-hotplug.txt	cpumask: fix cpu-hotplug documentation	2015-03-05 13:37:01 +10:30
cpu-load.txt	…
cputopology.txt	Documentation: Update cputopology.txt	2015-05-27 15:22:15 +02:00
crc32.txt	…
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	Doc: Change wikipedia's URL from http to https	2015-06-22 10:14:05 -06:00
dell_rbu.txt	…
devices.txt	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2014-04-04 09:50:07 -07:00
digsig.txt	…
dma-buf-sharing.txt	dma-buf: cleanup dma_buf_export() to make it easily extensible	2015-04-21 14:47:16 +05:30
dontdiff	Documentation: LLVMLinux: Update Documentation/dontdiff	2014-04-09 13:44:34 -07:00
dynamic-debug-howto.txt	doc: spelling error changes	2014-05-05 15:32:05 +02:00
edac.txt	EDAC: Update Documentation/edac.txt	2015-06-24 18:17:40 +02:00
efi-stub.txt	doc: arm64: add description of EFI stub support	2014-04-30 19:57:05 +01:00
eisa.txt	…
email-clients.txt	Documentation/email-clients.txt: Fix one grammar mistake, add extra info about TB	2015-03-20 07:41:55 -06:00
flexible-arrays.txt	…
futex-requeue-pi.txt	doc: Fix misnamed FUTEX_CMP_REQUEUE_PI op constants	2015-01-19 12:05:32 +01:00
gcov.txt	…
gdb-kernel-debugging.txt	scripts/gdb: add basic documentation	2015-02-17 14:34:54 -08:00
highuid.txt	…
hsi.txt	Documentation: HSI: Add some general description for the HSI subsystem	2014-05-04 09:49:46 +02:00
hw_random.txt	…
hwspinlock.txt	…
init.txt	…
initrd.txt	…
intel_txt.txt	…
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	…
irqflags-tracing.txt	asm/system.h: clean asm/system.h from docs	2014-04-07 16:36:11 -07:00
isapnp.txt	…
java.txt	Documentation: update java sample wrapper for java 7	2014-05-25 12:39:00 -07:00
kasan.txt	Merge branch 'doc/4.2' into docs-next	2015-06-08 17:04:11 -06:00
kernel-doc-nano-HOWTO.txt	…
kernel-docs.txt	…
kernel-parameters.txt	Documentation updates for 4.2	2015-06-24 20:01:36 -07:00
kernel-per-CPU-kthreads.txt	documentation: Update per-CPU kthreads documentation	2015-02-26 11:57:30 -08:00
kmemcheck.txt	Documentation: update the CONFIG_DEBUG_PAGEALLOC description	2015-03-20 07:41:55 -06:00
kmemleak.txt	Doc: Change wikipedia's URL from http to https	2015-06-22 10:14:05 -06:00
kobject.txt	kobject: grammar fix	2014-12-08 09:07:11 -05:00
kprobes.txt	kprobes: Update Documentation/kprobes.txt	2015-03-20 07:41:55 -06:00
kref.txt	…
kselftest.txt	kselftest: Move the docs to the Documentation dir	2014-11-24 10:49:54 -07:00
ldm.txt	…
local_ops.txt	percpu: update local_ops.txt to reflect this_cpu operations	2014-12-13 12:42:53 -08:00
lockup-watchdogs.txt	watchdog: add watchdog_cpumask sysctl to assist nohz	2015-06-24 17:49:40 -07:00
logo.gif	…
logo.txt	…
lzo.txt	Documentation: lzo: document part of the encoding	2014-09-28 11:08:00 +02:00
magic-number.txt	Documentation/magic-number: Remove SCC_MAGIC	2015-05-13 15:39:04 -04:00
mailbox.txt	Documentation: Fix a typo in mailbox.txt	2014-11-03 11:54:50 -05:00
md-cluster.txt	md-cluster: Design Documentation	2015-02-23 07:16:46 -06:00
md.txt	doc:md: fix typo in md.txt.	2015-06-23 06:49:44 -06:00
media-framework.txt	…
memory-barriers.txt	Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-06-22 14:54:22 -07:00
memory-hotplug.txt	mem-hotplug: fix typo in Documentation/memory-hotplug.txt	2015-03-20 07:41:55 -06:00
module-signing.txt	modsign: change default key details	2015-04-30 09:35:41 -07:00
mono.txt	…
nommu-mmap.txt	fs: introduce f_op->mmap_capabilities for nommu mmap support	2015-01-20 14:02:58 -07:00
numastat.txt	…
oops-tracing.txt	livepatch: kernel: add TAINT_LIVEPATCH	2014-12-22 15:40:48 +01:00
padata.txt	…
parport-lowlevel.txt	…
parport.txt	…
percpu-rw-semaphore.txt	…
phy.txt	phy: improved lookup method	2014-11-21 19:48:50 +05:30
pi-futex.txt	…
pinctrl.txt	pinctrl: move strict option to pinmux_ops	2015-05-06 14:45:19 +02:00
pnp.txt	…
preempt-locking.txt	x86/fpu: Rename math_state_restore() to fpu__restore()	2015-05-19 15:47:18 +02:00
printk-formats.txt	The documentation tree update for 4.1. Numerous fixes, the overdue removal	2015-04-18 11:10:49 -04:00
pwm.txt	pwm: modify PWM_LOOKUP to initialize all struct pwm_lookup members	2014-05-21 11:19:36 +02:00
ramoops.txt	pstore-ram: Allow optional mapping with pgprot_noncached	2014-12-11 13:38:31 -08:00
rbtree.txt	doc: spelling error changes	2014-05-05 15:32:05 +02:00
remoteproc.txt	…
rfkill.txt	rfkill: document rfkill module parameters	2015-01-09 23:22:12 +01:00
robust-futex-ABI.txt	…
robust-futexes.txt	doc: spelling error changes	2014-05-05 15:32:05 +02:00
rpmsg.txt	…
rtc.txt	Documentation, split up rtc.txt into documentation and test file	2015-03-24 22:01:58 -06:00
serial-console.txt	…
sgi-ioc4.txt	…
smsc_ece1099.txt	…
sparse.txt	…
stable_api_nonsense.txt	…
stable_kernel_rules.txt	stable: Update documentation to clarify preferred procedure	2015-05-22 09:38:56 -06:00
static-keys.txt	…
svga.txt	…
sysfs-rules.txt	Documentation/sysfs-rules.txt: Add device attribute error code documentation	2014-09-19 14:44:51 -07:00
sysrq.txt	…
this_cpu_ops.txt	Docs: this_cpu_ops: remove redundant add forms	2014-09-26 11:03:00 +02:00
unaligned-memory-access.txt	…
unicode.txt	…
unshare.txt	…
vfio.txt	vfio: powerpc/spapr: Support Dynamic DMA windows	2015-06-11 15:16:55 +10:00
vgaarbiter.txt	…
video-output.txt	…
vme_api.txt	…
volatile-considered-harmful.txt	…
workqueue.txt	…
xillybus.txt	xillybus: Move out of staging	2014-09-23 23:44:16 -07:00
xz.txt	…
zorro.txt	…