From: Srinivas Kandagatla <srini@kernel.org>

Hi Greg, 
Here are two fixes that can go into v7.2 release

Could you please queue them as 7.2 material.

Thanks,
Srini

Aelin Reidel (1):
  nvmem: apple-spmi-nvmem: wrap regmap calls to satisfy CFI

Mathieu Dubois-Briand (1):
  nvmem: layouts: Add fixed-layout driver

 MAINTAINERS                          |  5 +++
 drivers/nvmem/apple-spmi-nvmem.c     | 20 +++++++++-
 drivers/nvmem/core.c                 | 24 +-----------
 drivers/nvmem/internals.h            |  2 +
 drivers/nvmem/layouts.c              | 11 ------
 drivers/nvmem/layouts/Makefile       |  1 +
 drivers/nvmem/layouts/fixed-layout.c | 58 ++++++++++++++++++++++++++++
 include/linux/nvmem-provider.h       |  6 +++
 8 files changed, 92 insertions(+), 35 deletions(-)
 create mode 100644 drivers/nvmem/layouts/fixed-layout.c

-- 
2.53.0