From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Dec 2019 22:02:12 +0000 (-0800)
Subject: Merge tag 'sizeof_field-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.10.7~3655
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=22ff311af9c7d0eca4e9d276e95c4793a6ecf84f;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'sizeof_field-v5.5-rc2' of git://git./linux/kernel/git/kees/linux

Pull FIELD_SIZEOF conversion from Kees Cook:
 "A mostly mechanical treewide conversion from FIELD_SIZEOF() to
  sizeof_field(). This avoids the redundancy of having 2 macros
  (actually 3) doing the same thing, and consolidates on sizeof_field().
  While "field" is not an accurate name, it is the common name used in
  the kernel, and doesn't result in any unintended innuendo.

  As there are still users of FIELD_SIZEOF() in -next, I will clean up
  those during this coming development cycle and send the final old
  macro removal patch at that time"

* tag 'sizeof_field-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  treewide: Use sizeof_field() macro
  MIPS: OCTEON: Replace SIZEOF_FIELD() macro
---

22ff311af9c7d0eca4e9d276e95c4793a6ecf84f