From: Linus Torvalds Date: Wed, 30 Jun 2021 22:22:05 +0000 (-0700) Subject: Merge tag 'audit-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoor... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=290fe0fa6f5a1a3374dfd03fe0eda6c43d53e6cf;p=linux.git Merge tag 'audit-pr-20210629' of git://git./linux/kernel/git/pcmoore/audit Pull audit updates from Paul Moore: "Another merge window, another small audit pull request. Four patches in total: one is cosmetic, one removes an unnecessary initialization, one renames some enum values to prevent name collisions, and one converts list_del()/list_add() to list_move(). None of these are earth shattering and all pass the audit-testsuite tests while merging cleanly on top of your tree from earlier today" * tag 'audit-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit: audit: remove unnecessary 'ret' initialization audit: remove trailing spaces and tabs audit: Use list_move instead of list_del/list_add audit: Rename enum audit_state constants to avoid AUDIT_DISABLED redefinition audit: add blank line after variable declarations --- 290fe0fa6f5a1a3374dfd03fe0eda6c43d53e6cf