From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Jul 2019 16:34:10 +0000 (-0700)
Subject: Merge tag 'for-linus-20190617' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=415bfd9cdb175cf870fb173ae9d3958862de2c97;p=linux.git

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.
---

415bfd9cdb175cf870fb173ae9d3958862de2c97
diff --cc arch/sh/configs/se7712_defconfig
index 1e116529735f0,6ac7d362e1065..9a527f978106a
--- a/arch/sh/configs/se7712_defconfig
+++ b/arch/sh/configs/se7712_defconfig
@@@ -63,7 -63,7 +63,6 @@@ CONFIG_NET_SCH_NETEM=
  CONFIG_NET_CLS_TCINDEX=y
  CONFIG_NET_CLS_ROUTE4=y
  CONFIG_NET_CLS_FW=y
- CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 -CONFIG_NET_CLS_IND=y
  CONFIG_MTD=y
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_CFI=y
diff --cc arch/sh/configs/se7721_defconfig
index c66e512719ab9,ffd15acc2a042..3b0e1eb6e8745
--- a/arch/sh/configs/se7721_defconfig
+++ b/arch/sh/configs/se7721_defconfig
@@@ -62,7 -62,7 +62,6 @@@ CONFIG_NET_SCH_NETEM=
  CONFIG_NET_CLS_TCINDEX=y
  CONFIG_NET_CLS_ROUTE4=y
  CONFIG_NET_CLS_FW=y
- CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 -CONFIG_NET_CLS_IND=y
  CONFIG_MTD=y
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_CFI=y
diff --cc arch/sh/configs/titan_defconfig
index 171ab05ce4fc3,1c1c78e74fbb9..4ec961ace6887
--- a/arch/sh/configs/titan_defconfig
+++ b/arch/sh/configs/titan_defconfig
@@@ -142,7 -142,7 +142,6 @@@ CONFIG_GACT_PROB=
  CONFIG_NET_ACT_MIRRED=m
  CONFIG_NET_ACT_IPT=m
  CONFIG_NET_ACT_PEDIT=m
- CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 -CONFIG_NET_CLS_IND=y
  CONFIG_FW_LOADER=m
  CONFIG_CONNECTOR=m
  CONFIG_MTD=m