Revision 1a931707ad4a46e79d4ecfee56d8f6e8cc8d4f28 authored by Arnaldo Carvalho de Melo on 16 December 2022, 12:53:53 UTC, committed by Arnaldo Carvalho de Melo on 16 December 2022, 12:53:53 UTC
To resolve a trivial merge conflict with c302378bc157f6a7 ("libbpf:
Hashmap interface update to allow both long and void* keys/values"),
where a function present upstream was removed in the perf tools
development tree.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| File | Mode | Size |
|---|---|---|
| Kconfig | -rw-r--r-- | 3.1 KB |
| Makefile | -rw-r--r-- | 523 bytes |
| armada-370-xp.h | -rw-r--r-- | 511 bytes |
| board-v7.c | -rw-r--r-- | 5.0 KB |
| coherency.c | -rw-r--r-- | 7.9 KB |
| coherency.h | -rw-r--r-- | 505 bytes |
| coherency_ll.S | -rw-r--r-- | 4.0 KB |
| common.h | -rw-r--r-- | 802 bytes |
| cpu-reset.c | -rw-r--r-- | 2.0 KB |
| dove.c | -rw-r--r-- | 726 bytes |
| headsmp-a9.S | -rw-r--r-- | 525 bytes |
| headsmp.S | -rw-r--r-- | 1000 bytes |
| kirkwood-pm.c | -rw-r--r-- | 1.5 KB |
| kirkwood-pm.h | -rw-r--r-- | 403 bytes |
| kirkwood.c | -rw-r--r-- | 4.6 KB |
| kirkwood.h | -rw-r--r-- | 609 bytes |
| mvebu-soc-id.c | -rw-r--r-- | 4.0 KB |
| mvebu-soc-id.h | -rw-r--r-- | 1.1 KB |
| platsmp-a9.c | -rw-r--r-- | 3.2 KB |
| platsmp.c | -rw-r--r-- | 6.3 KB |
| pm-board.c | -rw-r--r-- | 3.2 KB |
| pm.c | -rw-r--r-- | 6.2 KB |
| pmsu.c | -rw-r--r-- | 16.2 KB |
| pmsu.h | -rw-r--r-- | 688 bytes |
| pmsu_ll.S | -rw-r--r-- | 1.8 KB |
| system-controller.c | -rw-r--r-- | 4.6 KB |
Computing file changes ...
