Update config for symbol changes in 4.2

Re-enable various config options disabled by name changes:
- SUNRPC_XPRT_RDMA replaced SUNRPC_XPRT_RDMA_{CLIENT,SERVER}
- [mips*el/loongson*] LOONGSON64 replaced LOONGSON
- [x86] COMEDI_8255_SA replaced COMEDI_8255

Drop explicit settings for symbols that are now automatic.

debian/changelog

@@ -6,6 +6,10 @@ linux (4.2~rc8-1~exp2) UNRELEASED; urgency=medium
   * gfs2: Make statistics unsigned, suitable for use with do_div()
     (fixes FTBFS on mips,mipsel,m68k)
   * [amd64] Enable KALLSYMS_ALL (Closes: #660288), LIVEPATCH
+  * Re-enable various config options disabled by name changes in 4.2:
+    - SUNRPC_XPRT_RDMA replaced SUNRPC_XPRT_RDMA_{CLIENT,SERVER}
+    - [mips*el/loongson*] LOONGSON64 replaced LOONGSON
+    - [x86] COMEDI_8255_SA replaced COMEDI_8255
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 25 Aug 2015 18:50:57 +0100
 

debian/config/config

@@ -265,8 +265,8 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 ##
 CONFIG_BCMA=m
 CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_DRIVER_PCI_HOSTMODE is not set
 # CONFIG_BCMA_HOST_SOC is not set
+# CONFIG_BCMA_DRIVER_PCI_HOSTMODE is not set
 # CONFIG_BCMA_DRIVER_GMAC_CMN is not set
 # CONFIG_BCMA_DRIVER_GPIO is not set
 # CONFIG_BCMA_DEBUG is not set
@@ -312,7 +312,6 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 ##
 CONFIG_ZRAM=m
 CONFIG_ZRAM_LZ4_COMPRESS=y
-# CONFIG_ZRAM_DEBUG is not set
 
 ##
 ## file: drivers/bluetooth/Kconfig
@@ -2415,6 +2414,7 @@ CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_IPVLAN=m
 CONFIG_VXLAN=m
+CONFIG_GENEVE=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_TUN=m
@@ -3507,8 +3507,8 @@ CONFIG_PTP_1588_CLOCK_IXP46X=m
 ##
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_SYSTOHC=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
 # CONFIG_RTC_DEBUG is not set
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
@@ -3847,11 +3847,6 @@ CONFIG_STAGING=y
 ##
 # CONFIG_GS_FPGABOOT is not set
 
-##
-## file: drivers/staging/i2o/Kconfig
-##
-# CONFIG_I2O is not set
-
 ##
 ## file: drivers/staging/iio/Kconfig
 ##
@@ -5170,13 +5165,7 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-## choice: RCU Implementation
-CONFIG_TREE_RCU=y
-## end choice
-# CONFIG_TASKS_RCU is not set
-# CONFIG_RCU_USER_QS is not set
 CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
 CONFIG_RCU_FAST_NO_HZ=y
 CONFIG_RCU_KTHREAD_PRIO=0
 # CONFIG_IKCONFIG is not set
@@ -5731,7 +5720,6 @@ CONFIG_SYN_COOKIES=y
 CONFIG_NET_IPVTI=m
 CONFIG_NET_FOU=m
 CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_GENEVE=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -6225,8 +6213,7 @@ CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 ##
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_SUNRPC_DEBUG=y
-CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m
-CONFIG_SUNRPC_XPRT_RDMA_SERVER=m
+CONFIG_SUNRPC_XPRT_RDMA=m
 
 ##
 ## file: net/tipc/Kconfig
@@ -6451,7 +6438,6 @@ CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_INPUT_BEEP=y
 CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_JACK=y
 CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_CODEC_REALTEK=y
 CONFIG_SND_HDA_CODEC_ANALOG=y

debian/config/kernelarch-mips/config.loongson-2e

@@ -2,7 +2,7 @@
 ## file: arch/mips/Kconfig
 ##
 ## choice: System type
-CONFIG_MACH_LOONGSON=y
+CONFIG_MACH_LOONGSON64=y
 ## end choice
 ## choice: Kernel code model
 # CONFIG_32BIT is not set
@@ -13,7 +13,7 @@ CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
 
 ##
-## file: arch/mips/loongson/Kconfig
+## file: arch/mips/loongson64/Kconfig
 ##
 ## choice: Machine Type
 CONFIG_LEMOTE_FULOONG2E=y

debian/config/kernelarch-mips/config.loongson-2f

@@ -2,7 +2,7 @@
 ## file: arch/mips/Kconfig
 ##
 ## choice: System type
-CONFIG_MACH_LOONGSON=y
+CONFIG_MACH_LOONGSON64=y
 ## end choice
 ## choice: Kernel code model
 # CONFIG_32BIT is not set
@@ -13,7 +13,7 @@ CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
 
 ##
-## file: arch/mips/loongson/Kconfig
+## file: arch/mips/loongson64/Kconfig
 ##
 ## choice: Machine Type
 CONFIG_LEMOTE_MACH2F=y

debian/config/kernelarch-mips/config.loongson-3

@@ -2,7 +2,7 @@
 ## file: arch/mips/Kconfig
 ##
 ## choice: System type
-CONFIG_MACH_LOONGSON=y
+CONFIG_MACH_LOONGSON64=y
 ## end choice
 CONFIG_HOTPLUG_CPU=y
 ## choice: Kernel code model
@@ -14,7 +14,7 @@ CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
 
 ##
-## file: arch/mips/loongson/Kconfig
+## file: arch/mips/loongson64/Kconfig
 ##
 ## choice: Machine Type
 CONFIG_LOONGSON_MACH3X=y

debian/config/kernelarch-x86/config

@@ -257,7 +257,6 @@ CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_PMEM=m
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -1214,6 +1213,11 @@ CONFIG_NFC_MEI_PHY=m
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_MEI=m
 
+##
+## file: drivers/nvdimm/Kconfig
+##
+CONFIG_BLK_DEV_PMEM=m
+
 ##
 ## file: drivers/pci/Kconfig
 ##
@@ -1470,7 +1474,7 @@ CONFIG_COMEDI_USBDUX=m
 CONFIG_COMEDI_USBDUXFAST=m
 CONFIG_COMEDI_USBDUXSIGMA=m
 CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_8255_SA=m
 CONFIG_COMEDI_KCOMEDILIB=m
 
 ##