From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Jul 2025 19:22:16 +0000 (-0700)
Subject: Merge tag 'bitmap-for-6.16-rc6' of https://github.com/norov/linux
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2dbae28a1d263902d647822937f9c42090c4adcc;p=linux-block.git

Merge tag 'bitmap-for-6.16-rc6' of https://github.com/norov/linux

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)
---

2dbae28a1d263902d647822937f9c42090c4adcc