]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3b5b88 1afc85d)
Merge tag 'bitmap-for-6.16-rc6' of https://github.com/norov/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Jul 2025 19:22:16 +0000 (12:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Jul 2025 19:22:16 +0000 (12:22 -0700)
Pull bitops UAPI fix from Yury Norov:
 "Fix BITS_PER_LONG merge error

  Tomas' fix for __BITS_PER_LONG was effectively reverted by a wrong
  merge. Fix it and add the related files to MAINTAINERS"

* tag 'bitmap-for-6.16-rc6' of https://github.com/norov/linux:
  MAINTAINERS: bitmap: add UAPI headers
  uapi: bitops: use UAPI-safe variant of BITS_PER_LONG again (2)

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
XArray, radix tree and IDR