diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-06 13:49:03 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-06 13:49:03 -0800 |
commit | 9343224bfd4be6a02e6ae0c0d66426c955c7d76e (patch) | |
tree | c5d2287ff3a8fdfc15186dd35b9c00896003114d /fs/cifs/smb1ops.c | |
parent | f2de3a159937bfb1ab1ca671e0f2d06cda286a24 (diff) | |
parent | 227d53b397a32a7614667b3ecaf1d89902fb6c12 (diff) |
Merge branch 'akpm' (patches from Andrew Morton)
Merge a bunch of fixes from Andrew Morton:
"Commit 579f82901f6f ("swap: add a simple detector for inappropriate
swapin readahead") is a feature. No probs if you decide to defer it
until the next merge window.
It has been sitting in my tree for over a year because of my dislike
of all the magic numbers, but recent discussion with Hugh has made me
give up"
* emailed patches fron Andrew Morton <akpm@linux-foundation.org>:
mm: __set_page_dirty uses spin_lock_irqsave instead of spin_lock_irq
arch/x86/mm/numa.c: fix array index overflow when synchronizing nid to memblock.reserved.
arch/x86/mm/numa.c: initialize numa_kernel_nodes in numa_clear_kernel_node_hotplug()
mm: __set_page_dirty_nobuffers() uses spin_lock_irqsave() instead of spin_lock_irq()
mm/swap: fix race on swap_info reuse between swapoff and swapon
swap: add a simple detector for inappropriate swapin readahead
ocfs2: free allocated clusters if error occurs after ocfs2_claim_clusters
Documentation/kernel-parameters.txt: fix memmap= language
Diffstat (limited to 'fs/cifs/smb1ops.c')
0 files changed, 0 insertions, 0 deletions