Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git
# Conflicts: # include/linux/cpumask.h
Showing
- arch/riscv/include/asm/bitops.h 1 addition, 1 deletionarch/riscv/include/asm/bitops.h
- include/linux/bitops.h 5 additions, 0 deletionsinclude/linux/bitops.h
- include/linux/cpumask.h 7 additions, 35 deletionsinclude/linux/cpumask.h
- lib/cpumask_kunit.c 1 addition, 0 deletionslib/cpumask_kunit.c
- lib/find_bit_benchmark.c 1 addition, 0 deletionslib/find_bit_benchmark.c
- lib/test_bitmap.c 1 addition, 0 deletionslib/test_bitmap.c
- tools/include/linux/bitmap.h 16 additions, 1 deletiontools/include/linux/bitmap.h
- tools/lib/bitmap.c 20 additions, 0 deletionstools/lib/bitmap.c
- tools/testing/radix-tree/Makefile 2 additions, 2 deletionstools/testing/radix-tree/Makefile
- tools/testing/radix-tree/bitmap.c 0 additions, 23 deletionstools/testing/radix-tree/bitmap.c
Loading
Please register or sign in to comment