Merge 4.15-rc4 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/ccree/ssi_hash.c
Simple merge

diff --cc drivers/staging/pi433/rf69.c
index f77ecd60f43ab8f1d55b2f26d84cb6cb4c4dfe4d,12c9df9cddde22bea46650ededda1ed4d3e057ae..3675dc03a7d33a6af4f9256ddf5acfb448fe2076
--- 1/drivers/staging/pi433/rf69.c
--- 2/drivers/staging/pi433/rf69.c
+++ b/drivers/staging/pi433/rf69.c
@@@ -100,12 -96,16 +100,12 @@@ enum modulation rf69_get_modulation(str
  {
        u8 currentValue;
  
 -      #ifdef DEBUG
 -              dev_dbg(&spi->dev, "get: mode");
 -      #endif
 -
 -      currentValue = READ_REG(REG_DATAMODUL);
 +      currentValue = rf69_read_reg(spi, REG_DATAMODUL);
  
-       switch (currentValue & MASK_DATAMODUL_MODULATION_TYPE >> 3) { // TODO improvement: change 3 to define
+       switch (currentValue & MASK_DATAMODUL_MODULATION_TYPE) {
        case DATAMODUL_MODULATION_TYPE_OOK: return OOK;
        case DATAMODUL_MODULATION_TYPE_FSK: return FSK;
 -      default:                            return undefined;
 +      default:                            return UNDEF;
        }
  }