Linux v4.2-rc4-111-g8400935737bf

6 files changed, 53 insertions, 5 deletions

diff --git a/config-armv7-generic b/config-armv7-generic
index 4b8949804..169a38a31 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -833,6 +833,12 @@ CONFIG_CROS_EC_CHARDEV=m
 CONFIG_R8188EU=m
 # CONFIG_88EU_AP_MODE is not set
 
+# CAN drivers
+# CONFIG_CAN_TI_HECC is not set
+# CONFIG_CAN_FLEXCAN is not set
+# CONFIG_CAN_RCAR is not set
+# CONFIG_CAN_MCP251X is not set
+
 # Needs work/investigation
 # CONFIG_ARM_KPROBES_TEST is not set
 
diff --git a/config-generic b/config-generic
index 7d522762a..b7e23ded2 100644
--- a/config-generic
+++ b/config-generic
@@ -1236,6 +1236,7 @@ CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_TEXT=m
 CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_CANID=m
 CONFIG_NET_EMATCH_U32=m
 
 CONFIG_NET_ACT_CSUM=m
@@ -1941,7 +1942,43 @@ CONFIG_HAMRADIO=y
 CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
 
-# CONFIG_CAN is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_LEDS=y
+# CONFIG_CAN_GRCAN is not set
+# CONFIG_CAN_XILINXCAN is not set
+CONFIG_CAN_SJA1000=m
+# CONFIG_CAN_SJA1000_ISA is not set
+CONFIG_CAN_SJA1000_PLATFORM=m
+# CONFIG_CAN_EMS_PCMCIA is not set
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_EMS_USB=m
+# CONFIG_CAN_PEAK_PCMCIA is not set
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_PLX_PCI=m
+# CONFIG_CAN_TSCAN1 is not set
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_CC770=m
+# CONFIG_CAN_CC770_ISA is not set
+CONFIG_CAN_CC770_PLATFORM=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_SOFTING=m
+# CONFIG_CAN_SOFTING_CS is not set
 
 CONFIG_NETROM=m
 CONFIG_ROSE=m
diff --git a/config-x86-generic b/config-x86-generic
index 0b7912397..56c16c16b 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -565,5 +565,7 @@ CONFIG_MODULE_SIG_UEFI=y
 CONFIG_VMXNET3=m
 CONFIG_VFIO_PCI_VGA=y
 
+CONFIG_PCH_CAN=m
+
 # CONFIG_X86_DEBUG_FPU is not set
 # CONFIG_PUNIT_ATOM_DEBUG is not set
diff --git a/filter-modules.sh b/filter-modules.sh
index 4ae5898f3..5abfc8627 100755
--- a/filter-modules.sh
+++ b/filter-modules.sh
@@ -16,7 +16,7 @@
 # Set the default dirs/modules to filter out
 driverdirs="atm auxdisplay bcma bluetooth fmc iio infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb staging uio uwb"
 
-netdrvs="appletalk dsa hamradio ieee802154 irda ppp slip usb wireless"
+netdrvs="appletalk can dsa hamradio ieee802154 irda ppp slip usb wireless"
 
 ethdrvs="3com adaptec alteon amd atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell mellanox neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti wiznet xircom"
 
@@ -28,7 +28,7 @@ usbdrvs="atm wusbcore"
 
 fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs udf ufs"
 
-netprots="appletalk atm ax25 batman-adv bluetooth dccp dsa ieee802154 irda l2tp mac80211 mac802154 netrom nfc rds rfkill rose sctp wireless"
+netprots="appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 netrom nfc rds rfkill rose sctp wireless"
 
 drmdrvs="ast gma500 mgag200 via nouveau"
 
diff --git a/kernel.spec b/kernel.spec
index a5559c0f4..09bf9556a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 4
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -2019,6 +2019,9 @@ fi
 #
 # 
 %changelog
+* Fri Jul 31 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.2.0-0.rc4.git4.1
+- Linux v4.2-rc4-111-g8400935737bf
+
 * Thu Jul 30 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.2.0-0.rc4.git3.1
 - Linux v4.2-rc4-87-g86ea07ca846a
 
diff --git a/sources b/sources
index 5cd5c5af4..897b58cab 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 fe9dc0f6729f36400ea81aa41d614c37  linux-4.1.tar.xz
 84e34c2f58901edcc5c840fe9893c02e  perf-man-4.1.tar.gz
 8c9a9889e1994c220e9794ffc54301f2  patch-4.2-rc4.xz
-0ff2f0d947375c766447df211f42d02e  patch-4.2-rc4-git3.xz
+13e4756b83fa36808a90554fd26b5bd3  patch-4.2-rc4-git4.xz