diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-12 01:22:05 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-12 01:22:05 +0300 |
| commit | 6d76f6eb46cbf8334b37352f2c2908329d028286 (patch) | |
| tree | 126df071dfd8e49bc8fdcefdfde7aa6331175516 /security/apparmor/include | |
| parent | 600b18f88f2625ba48542dfeaa5fe8b23b3fd2c4 (diff) | |
| parent | 6dbe88e93c351a6cf5b7c70850d7a1a7f67d83ab (diff) | |
| download | linux-6d76f6eb46cbf8334b37352f2c2908329d028286.tar.xz | |
Merge tag 'm68knommu-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
"Only two changes.
One removes the now unused CONFIG_MCPU32 symbol. The other sets a
default for the CONFIG_MEMORY_RESERVE config symbol (this aids
scripting and other automation) so you don't interactively get asked
for a value at configure time.
Summary:
- remove unused CONFIG_MCPU32 symbol
- default CONFIG_MEMORY_RESERVE value (for scripting)"
* tag 'm68knommu-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: Remove MCPU32 config symbol
m68k: set a default value for MEMORY_RESERVE
Diffstat (limited to 'security/apparmor/include')
0 files changed, 0 insertions, 0 deletions