Merge remote-tracking branches 'spi/topic/res', 'spi/topic/rockchip', 'spi/topic...

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi-rockchip.c
Simple merge

diff --cc include/linux/spi/spi.h
index f54667b,5396ee5,53be3a4,53be3a4,ba0dee9,53be3a4..857a9a1
--- 1/include/linux/spi/spi.h
--- 2/include/linux/spi/spi.h
--- 3/include/linux/spi/spi.h
--- 4/include/linux/spi/spi.h
--- 5/include/linux/spi/spi.h
--- 6/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@@@@@@ -600,37 -582,38 -582,6 -582,6 -587,6 -582,6 +600,38 @@@@@@@ extern void spi_unregister_master(struc
      
      extern struct spi_master *spi_busnum_to_master(u16 busnum);
      
-     typedef void (*spi_res_release_t)(struct spi_master *master,
-                                 struct spi_message *msg,
-                                 void *res);
  ++++/*
  ++++ * SPI resource management while processing a SPI message
  ++++ */
  ++++
+ ++++typedef void (*spi_res_release_t)(struct spi_master *master,
+ ++++                            struct spi_message *msg,
+ ++++                            void *res);
+ ++++
  ++++/**
  ++++ * struct spi_res - spi resource management structure
  ++++ * @entry:   list entry
  ++++ * @release: release code called prior to freeing this resource
  ++++ * @data:    extra data allocated for the specific use-case
  ++++ *
  ++++ * this is based on ideas from devres, but focused on life-cycle
  ++++ * management during spi_message processing
  ++++ */
  ++++struct spi_res {
  ++++  struct list_head        entry;
  ++++  spi_res_release_t       release;
  ++++  unsigned long long      data[]; /* guarantee ull alignment */
  ++++};
  ++++
  ++++extern void *spi_res_alloc(struct spi_device *spi,
  ++++                     spi_res_release_t release,
  ++++                     size_t size, gfp_t gfp);
  ++++extern void spi_res_add(struct spi_message *message, void *res);
  ++++extern void spi_res_free(void *res);
  ++++
  ++++extern void spi_res_release(struct spi_master *master,
  ++++                      struct spi_message *message);
  ++++
      /*---------------------------------------------------------------------------*/
      
      /*