summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'landlock_v34' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2021-05-0272-77/+6987
|\
| * landlock: Enable user space to infer supported featuresMickaël Salaün2021-04-223-4/+68
| * landlock: Add user and kernel documentationMickaël Salaün2021-04-225-0/+400
| * samples/landlock: Add a sandbox manager exampleMickaël Salaün2021-04-226-0/+261
| * selftests/landlock: Add user space testsMickaël Salaün2021-04-2210-0/+3570
| * landlock: Add syscall implementationsMickaël Salaün2021-04-225-1/+508
| * arch: Wire up Landlock syscallsMickaël Salaün2021-04-2219-2/+62
| * fs,security: Add sb_delete hookMickaël Salaün2021-04-225-0/+14
| * landlock: Support filesystem access-controlMickaël Salaün2021-04-2212-2/+866
| * LSM: Infrastructure management of the superblockCasey Schaufler2021-04-227-70/+85
| * landlock: Add ptrace restrictionsMickaël Salaün2021-04-224-1/+137
| * landlock: Set up the security framework and manage credentialsMickaël Salaün2021-04-227-6/+178
| * landlock: Add ruleset and domain managementMickaël Salaün2021-04-224-1/+652
| * landlock: Add object managementMickaël Salaün2021-04-227-0/+195
* | Merge tag 'integrity-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2021-05-0212-14/+75
|\ \
| * | ima: ensure IMA_APPRAISE_MODSIG has necessary dependenciesNayna Jain2021-04-273-2/+5
| * | ima: Fix fall-through warnings for ClangGustavo A. R. Silva2021-04-202-0/+3
| * | integrity: Add declarations to init_once void arguments.Jiele Zhao2021-04-091-1/+1
| * | ima: Fix function name error in comment.Jiele Zhao2021-04-091-1/+1
| * | Merge branch 'ima-module-signing-v4' into next-integrityMimi Zohar2021-04-098-18/+76
| |\ \
| | * | ima: enable loading of build time generated key on .ima keyringNayna Jain2021-04-094-11/+61
| | * | ima: enable signing of modules with build time generated keyNayna Jain2021-04-093-4/+12
| | * | keys: cleanup build time module signing keysNayna Jain2021-04-091-3/+3
| |/ /
| * | ima: Fix the error code for restoring the PCR valueLi Huafei2021-03-241-2/+2
| * | ima: without an IMA policy loaded, return quicklyMimi Zohar2021-03-221-0/+6
* | | Merge tag 'perf-tools-for-v5.13-2021-04-29' of git://git.kernel.org/pub/scm/l...Linus Torvalds2021-05-01244-883/+9952
|\ \ \
| * | | perf build: Defer printing detected features to the end of all feature checksArnaldo Carvalho de Melo2021-04-291-0/+7
| * | | tools build: Allow deferring printing the results of feature detectionArnaldo Carvalho de Melo2021-04-291-10/+17
| * | | perf build: Regenerate the FEATURE_DUMP file after extra feature checksJiri Olsa2021-04-291-0/+6
| * | | perf session: Dump PERF_RECORD_TIME_CONV eventLeo Yan2021-04-293-1/+46
| * | | perf session: Add swap operation for event TIME_CONVLeo Yan2021-04-291-1/+14
| * | | perf jit: Let convert_timestamp() to be backwards-compatibleLeo Yan2021-04-292-10/+22
| * | | perf tools: Change fields type in perf_record_time_convLeo Yan2021-04-291-2/+3
| * | | perf tools: Enable libtraceevent dynamic linkingMichael Petlan2021-04-295-2/+32
| * | | perf Documentation: Document intel-hybrid supportJin Yao2021-04-293-0/+217
| * | | perf tests: Skip 'perf stat metrics (shadow stat) test' for hybridJin Yao2021-04-291-0/+3
| * | | perf tests: Support 'Convert perf time to TSC' test for hybridJin Yao2021-04-291-0/+12
| * | | perf tests: Support 'Session topology' test for hybridJin Yao2021-04-291-2/+11
| * | | perf tests: Support 'Parse and process metrics' test for hybridJin Yao2021-04-291-2/+6
| * | | perf tests: Support 'Track with sched_switch' test for hybridJin Yao2021-04-291-1/+5
| * | | perf tests: Skip 'Setup struct perf_event_attr' test for hybridJin Yao2021-04-291-0/+4
| * | | perf tests: Add hybrid cases for 'Roundtrip evsel->name' testJin Yao2021-04-291-7/+12
| * | | perf tests: Add hybrid cases for 'Parse event definition strings' testJin Yao2021-04-291-0/+171
| * | | perf record: Uniquify hybrid event nameJin Yao2021-04-291-0/+28
| * | | perf stat: Warn group events from different hybrid PMUJin Yao2021-04-296-0/+62
| * | | perf stat: Filter out unmatched aggregation for hybrid eventJin Yao2021-04-291-0/+3
| * | | perf stat: Add default hybrid eventsJin Yao2021-04-291-0/+28
| * | | perf record: Create two hybrid 'cycles' events by defaultJin Yao2021-04-297-9/+77
| * | | perf parse-events: Support event inside hybrid pmuJin Yao2021-04-291-0/+63
| * | | perf parse-events: Compare with hybrid pmu nameJin Yao2021-04-295-8/+34