The patch titled Subject: scripts/deprecated_terms: sync with inclusive terms has been added to the -mm tree. Its filename is scripts-deprecated_terms-sync-with-inclusive-terms.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/scripts-deprecated_terms-sync-with-inclusive-terms.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/scripts-deprecated_terms-sync-with-inclusive-terms.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: SeongJae Park <sjpark@xxxxxxxxx> Subject: scripts/deprecated_terms: sync with inclusive terms # NOTE: this patch is based on next/master, as this is a followup of # commit 0d8b43e5876a ("scripts/deprecated_terms: recommend # denylist/allowlist instead of blacklist/whitelist"), which merged in # next tree only. Commit a5f526ecb075 ("CodingStyle: Inclusive Terminology") introduced more terms to be deprecated with more alternatives. This commit updates 'deprecated_terms.txt' to sync with it. Link: http://lkml.kernel.org/r/20200713071912.24432-1-sjpark@xxxxxxxxxx Signed-off-by: SeongJae Park <sjpark@xxxxxxxxx> Cc: Dan Williams <dan.j.williams@xxxxxxxxx> Cc: Andy Whitcroft <apw@xxxxxxxxxxxxx> Cc: Joe Perches <joe@xxxxxxxxxxx> Cc: Colin Ian King <colin.king@xxxxxxxxxxxxx> Cc: SeongJae Park <sj38.park@xxxxxxxxx> Cc: Jiri Slaby <jslaby@xxxxxxx> Cc: Jonathan Corbet <corbet@xxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Mishi Choudhary <mishi@xxxxxxxxx> Cc: Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/deprecated_terms.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/scripts/deprecated_terms.txt~scripts-deprecated_terms-sync-with-inclusive-terms +++ a/scripts/deprecated_terms.txt @@ -3,5 +3,8 @@ # The format of each line is: # deprecated||suggested # -blacklist||denylist -whitelist||allowlist +blacklist||(denylist|blocklist) +# For other alternatives of 'slave', Please refer to +# Documentation/process/coding-style.rst +slave||(secondary|target|...) +whitelist||(allowlist|passlist) _ Patches currently in -mm which might be from sjpark@xxxxxxxxx are checkpatch-support-deprecated-terms-checking.patch scripts-deprecated_terms-recommend-denylist-allowlist-instead-of-blacklist-whitelist.patch scripts-deprecated_terms-sync-with-inclusive-terms.patch