diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2023-06-16 11:05:59 +0200 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2023-06-16 11:05:59 +0200 |
| commit | 7bc162d5cc4de5c33c5570dba2719a01506a9fd0 (patch) | |
| tree | a4c5d8ad3a96ae3850bfec8aaf4f65af4d3b0ba0 /include/linux/slab.h | |
| parent | 1143c9d9d7602f20ba7bb3cef0d07b10f23cbef7 (diff) | |
| parent | ffe4dfe0baddaf61318bd275cacd64d4dbbbe724 (diff) | |
| parent | d5bf485746991ce994994e5935b1cf223678f112 (diff) | |
| parent | eb07c4f39c3e858a7d0cc4bb15b8a304f83f0497 (diff) | |
Merge branches 'slab/for-6.5/prandom', 'slab/for-6.5/slab_no_merge' and 'slab/for-6.5/slab-deprecate' into slab/for-next
Merge the feature branches scheduled for 6.5:
- replace the usage of weak PRNGs, by David Keisar Schmidt
- introduce the SLAB_NO_MERGE kmem_cache flag, by Jesper Dangaard Brouer
- deprecate CONFIG_SLAB, with a planned removal, by myself