Commit 1c52283
committed
Merge branch 'akpm' (patches from Andrew)
Merge yet more updates from Andrew Morton:
"This is the post-linux-next queue. Material which was based on or
dependent upon material which was in -next.
69 patches.
Subsystems affected by this patch series: mm (migration and zsmalloc),
sysctl, proc, and lib"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (69 commits)
mm: hide the FRONTSWAP Kconfig symbol
frontswap: remove support for multiple ops
mm: mark swap_lock and swap_active_head static
frontswap: simplify frontswap_register_ops
frontswap: remove frontswap_test
mm: simplify try_to_unuse
frontswap: remove the frontswap exports
frontswap: simplify frontswap_init
frontswap: remove frontswap_curr_pages
frontswap: remove frontswap_shrink
frontswap: remove frontswap_tmem_exclusive_gets
frontswap: remove frontswap_writethrough
mm: remove cleancache
lib/stackdepot: always do filter_irq_stacks() in stack_depot_save()
lib/stackdepot: allow optional init and stack_table allocation by kvmalloc()
proc: remove PDE_DATA() completely
fs: proc: store PDE()->data into inode->i_private
zsmalloc: replace get_cpu_var with local_lock
zsmalloc: replace per zpage lock with pool->migrate_lock
locking/rwlocks: introduce write_lock_nested
...172 files changed
Lines changed: 1766 additions & 2820 deletions
File tree
- Documentation/vm
- arch
- alpha/kernel
- arm
- configs
- kernel
- mm
- ia64/kernel
- m68k/configs
- powerpc/kernel
- s390/configs
- sh/mm
- xtensa/platforms/iss
- block
- drivers
- acpi
- base/firmware_loader
- cdrom
- char
- gpu/drm
- i915
- hwmon
- macintosh
- net
- bonding
- wireless
- cisco
- intersil/hostap
- nubus
- parisc
- pci
- platform/x86
- pnp
- isapnp
- pnpbios
- scsi
- usb/gadget/function
- zorro
- fs
- afs
- btrfs
- ext4
- f2fs
- jbd2
- notify
- dnotify
- fanotify
- inotify
- ntfs3
- ocfs2
- proc
- include
- linux
- sched
- scsi
- init
- ipc
- kernel
- irq
- locking
- printk
- lib
- mm
- kasan
- net
- atm
- bluetooth
- can
- core
- ipv4
- netfilter
- netfilter
- sunrpc
- auth_gss
- sound/core
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | 11 | | |
18 | 12 | | |
19 | 13 | | |
| |||
45 | 39 | | |
46 | 40 | | |
47 | 41 | | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | 42 | | |
55 | 43 | | |
56 | 44 | | |
| |||
87 | 75 | | |
88 | 76 | | |
89 | 77 | | |
90 | | - | |
91 | | - | |
92 | | - | |
| 78 | + | |
93 | 79 | | |
94 | | - | |
| 80 | + | |
95 | 81 | | |
96 | 82 | | |
97 | 83 | | |
| |||
269 | 255 | | |
270 | 256 | | |
271 | 257 | | |
272 | | - | |
273 | | - | |
274 | | - | |
275 | | - | |
276 | | - | |
277 | | - | |
278 | | - | |
279 | | - | |
280 | | - | |
281 | | - | |
282 | | - | |
283 | | - | |
284 | | - | |
285 | 258 | | |
286 | 259 | | |
287 | 260 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
19 | 18 | | |
20 | 19 | | |
21 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4705 | 4705 | | |
4706 | 4706 | | |
4707 | 4707 | | |
4708 | | - | |
4709 | | - | |
4710 | | - | |
4711 | | - | |
4712 | | - | |
4713 | | - | |
4714 | | - | |
4715 | 4708 | | |
4716 | 4709 | | |
4717 | 4710 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
83 | 83 | | |
84 | 84 | | |
85 | 85 | | |
86 | | - | |
| 86 | + | |
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
93 | | - | |
| 93 | + | |
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
| |||
0 commit comments