Merge tag 'for-linus-20190617' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux

Pull SH updates from Yoshinori Sato.

kprobe fix, defconfig updates and a SH Kconfig fix.

* tag 'for-linus-20190617' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux:
  arch/sh: Check for kprobe trap number before trying to handle a kprobe trap
  sh: configs: Remove useless UEVENT_HELPER_PATH
  Fix allyesconfig output.
This commit is contained in:
Linus Torvalds
2019-07-17 09:34:10 -07:00
49 changed files with 5 additions and 59 deletions

View File

@@ -142,7 +142,6 @@ CONFIG_GACT_PROB=y
CONFIG_NET_ACT_MIRRED=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_FW_LOADER=m
CONFIG_CONNECTOR=m
CONFIG_MTD=m