diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-22 10:45:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-22 10:45:46 -0800 |
| commit | 238ca357079b1b378e55187e8ea34e9e9c4c5695 (patch) | |
| tree | 7b7c3ffeccab30adeff166fd09a18daa047cb904 /certs/blacklist_nohashes.c | |
| parent | bef3efbeb897b56867e271cdbc5f8adaacaeb9cd (diff) | |
| parent | 895f7b8e90200cf1a5dc313329369adf30e51f9a (diff) | |
| download | linux-238ca357079b1b378e55187e8ea34e9e9c4c5695.tar.bz2 | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"16 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: don't defer struct page initialization for Xen pv guests
lib/Kconfig.debug: enable RUNTIME_TESTING_MENU
vmalloc: fix __GFP_HIGHMEM usage for vmalloc_32 on 32b systems
selftests/memfd: add run_fuse_test.sh to TEST_FILES
bug.h: work around GCC PR82365 in BUG()
mm/swap.c: make functions and their kernel-doc agree (again)
mm/zpool.c: zpool_evictable: fix mismatch in parameter name and kernel-doc
ida: do zeroing in ida_pre_get()
mm, swap, frontswap: fix THP swap if frontswap enabled
certs/blacklist_nohashes.c: fix const confusion in certs blacklist
kernel/relay.c: limit kmalloc size to KMALLOC_MAX_SIZE
mm, mlock, vmscan: no more skipping pagevecs
mm: memcontrol: fix NR_WRITEBACK leak in memcg and system stats
Kbuild: always define endianess in kconfig.h
include/linux/sched/mm.h: re-inline mmdrop()
tools: fix cross-compile var clobbering
Diffstat (limited to 'certs/blacklist_nohashes.c')
| -rw-r--r-- | certs/blacklist_nohashes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/certs/blacklist_nohashes.c b/certs/blacklist_nohashes.c index 73fd99098ad7..753b703ef0ef 100644 --- a/certs/blacklist_nohashes.c +++ b/certs/blacklist_nohashes.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "blacklist.h" -const char __initdata *const blacklist_hashes[] = { +const char __initconst *const blacklist_hashes[] = { NULL }; |