Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6792dfe3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge misc fixes from Andrew Morton:
 "A bunch of fixes"

* emailed patches fron Andrew Morton <akpm@linux-foundation.org>:
  ocfs2: check existence of old dentry in ocfs2_link()
  ocfs2: update inode size after zeroing the hole
  ocfs2: fix issue that ocfs2_setattr() does not deal with new_i_size==i_size
  mm/memory-failure.c: move refcount only in !MF_COUNT_INCREASED
  smp.h: fix x86+cpu.c sparse warnings about arch nonboot CPU calls
  mm: fix page leak at nfs_symlink()
  slub: do not assert not having lock in removing freed partial
  gitignore: add all.config
  ocfs2: fix ocfs2_sync_file() if filesystem is readonly
  drivers/edac/edac_mc_sysfs.c: poll timeout cannot be zero
  fs/file.c:fdtable: avoid triggering OOMs from alloc_fdmem
  xen: properly account for _PAGE_NUMA during xen pte translations
  mm/slub.c: list_lock may not be held in some circumstances
  drivers/md/bcache/extents.c: use %zi to format size_t
  vmcore: prevent PT_NOTE p_memsz overflow during header update
  drivers/message/i2o/i2o_config.c: fix deadlock in compat_ioctl(I2OGETIOPS)
  Documentation/: update 00-INDEX files
  checkpatch: fix detection of git repository
  get_maintainer: fix detection of git repository
  drivers/misc/sgi-gru/grukdump.c: unlocking should be conditional in gru_dump_context()
parents cbf2822a 0e048316

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -92,3 +92,6 @@ extra_certificates 
signing_key.priv

signing_key.x509

x509.genkey



# Kconfig presets

all.config

Documentation/00-INDEX

+20 −4
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ DMA-ISA-LPC.txt 
	- How to do DMA with ISA (and LPC) devices.

DMA-attributes.txt

	- listing of the various possible attributes a DMA region can have

dmatest.txt

	- how to compile, configure and use the dmatest system.

DocBook/

	- directory with DocBook templates etc. for kernel documentation.

EDID/
@@ -77,6 +79,8 @@ arm/ 
	- directory with info about Linux on the ARM architecture.

arm64/

	- directory with info about Linux on the 64 bit ARM architecture.

assoc_array.txt

	- generic associative array intro.

atomic_ops.txt

	- semantics and behavior of atomic and bitmask operations.

auxdisplay/
@@ -87,6 +91,8 @@ bad_memory.txt 
	- how to use kernel parameters to exclude bad RAM regions.

basic_profiling.txt

	- basic instructions for those who wants to profile Linux kernel.

bcache.txt

	- Block-layer cache on fast SSDs to improve slow (raid) I/O performance.

binfmt_misc.txt

	- info on the kernel support for extra binary formats.

blackfin/
@@ -171,6 +177,8 @@ early-userspace/ 
	- info about initramfs, klibc, and userspace early during boot.

edac.txt

	- information on EDAC - Error Detection And Correction

efi-stub.txt

	- How to use the EFI boot stub to bypass GRUB or elilo on EFI systems.

eisa.txt

	- info on EISA bus support.

email-clients.txt
@@ -195,8 +203,8 @@ futex-requeue-pi.txt 
	- info on requeueing of tasks from a non-PI futex to a PI futex

gcov.txt

	- use of GCC's coverage testing tool "gcov" with the Linux kernel

gpio.txt

	- overview of GPIO (General Purpose Input/Output) access conventions.

gpio/

	- gpio related documentation

hid/

	- directory with information on human interface devices

highuid.txt
@@ -255,6 +263,8 @@ kernel-docs.txt 
	- listing of various WWW + books that document kernel internals.

kernel-parameters.txt

	- summary listing of command line / boot prompt args for the kernel.

kernel-per-CPU-kthreads.txt

	- List of all per-CPU kthreads and how they introduce jitter.

kmemcheck.txt

	- info on dynamic checker that detects uses of uninitialized memory.

kmemleak.txt
@@ -299,8 +309,6 @@ memory-devices/ 
	- directory with info on parts like the Texas Instruments EMIF driver

memory-hotplug.txt

	- Hotpluggable memory support, how to use and current status.

memory.txt

	- info on typical Linux memory problems.

metag/

	- directory with info about Linux on Meta architecture.

mips/
@@ -311,6 +319,8 @@ mmc/ 
	- directory with info about the MMC subsystem

mn10300/

	- directory with info about the mn10300 architecture port

module-signing.txt

	- Kernel module signing for increased security when loading modules.

mtd/

	- directory with info about memory technology devices (flash)

mono.txt
@@ -343,6 +353,8 @@ pcmcia/ 
	- info on the Linux PCMCIA driver.

percpu-rw-semaphore.txt

	- RCU based read-write semaphore optimized for locking for reading

phy.txt

	- Description of the generic PHY framework.

pi-futex.txt

	- documentation on lightweight priority inheritance futexes.

pinctrl.txt
@@ -431,6 +443,8 @@ sysrq.txt 
	- info on the magic SysRq key.

target/

	- directory with info on generating TCM v4 fabric .ko modules

this_cpu_ops.txt

	- List rationale behind and the way to use this_cpu operations.

thermal/

	- directory with information on managing thermal issues (CPU/temp)

trace/
@@ -469,6 +483,8 @@ wimax/ 
	- directory with info about Intel Wireless Wimax Connections

workqueue.txt

	- information on the Concurrency Managed Workqueue implementation

ww-mutex-design.txt

	- Intro to Mutex wait/would deadlock handling.s

x86/x86_64/

	- directory with info on Linux support for AMD x86-64 (Hammer) machines.

xtensa/

Documentation/RCU/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ listRCU.txt 
	- Using RCU to Protect Read-Mostly Linked Lists

lockdep.txt

	- RCU and lockdep checking

lockdep-splat.txt

	- RCU Lockdep splats explained.

NMI-RCU.txt

	- Using RCU to Protect Dynamic NMI Handlers

rcubarrier.txt

Documentation/arm/00-INDEX

+14 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ Booting 
	- requirements for booting

Interrupts

	- ARM Interrupt subsystem documentation

IXP4xx

	- Intel IXP4xx Network processor.

msm

	- MSM specific documentation

Netwinder
@@ -24,8 +26,16 @@ SPEAr 
	- ST SPEAr platform Linux Overview

VFP/

	- Release notes for Linux Kernel Vector Floating Point support code

cluster-pm-race-avoidance.txt

	- Algorithm for CPU and Cluster setup/teardown

empeg/

	- Ltd's Empeg MP3 Car Audio Player

firmware.txt

	- Secure firmware registration and calling.

kernel_mode_neon.txt

	- How to use NEON instructions in kernel mode

kernel_user_helpers.txt

	- Helper functions in kernel space made available for userspace.

mem_alignment

	- alignment abort handler documentation

memory.txt
@@ -34,3 +44,7 @@ nwfpe/ 
	- NWFPE floating point emulator documentation

swp_emulation

	- SWP/SWPB emulation handler/logging description

tcm.txt

	- ARM Tightly Coupled Memory

vlocks.txt

	- Voting locks, low-level mechanism relying on memory system atomic writes.

Documentation/blackfin/00-INDEX

+4 −2
Original line number Diff line number Diff line 
00-INDEX

	- This file



Makefile

	- Makefile for gptimers example file.

bfin-gpio-notes.txt

	- Notes in developing/using bfin-gpio driver.



bfin-spi-notes.txt

	- Notes for using bfin spi bus driver.

gptimers-example.c

	- gptimers example