]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'for-linus-20190617' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jul 2019 16:34:10 +0000 (09:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jul 2019 16:34:10 +0000 (09:34 -0700)
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.

1  2 
arch/sh/configs/hp6xx_defconfig
arch/sh/configs/sdk7786_defconfig
arch/sh/configs/se7712_defconfig
arch/sh/configs/se7721_defconfig
arch/sh/configs/sh2007_defconfig
arch/sh/configs/titan_defconfig

Simple merge
Simple merge
index 1e116529735f0734e50e40e977309a8fb7454010,6ac7d362e10656cff3440b0745b467c86a73b052..9a527f978106ad6b1002b67894edd4eff2b9693b
@@@ -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
index c66e512719ab97de42ca9141c4a99ddc1a72d51c,ffd15acc2a0424916056e4fcf6e1418f468232ed..3b0e1eb6e874507e2ecfe4531bf8aba6ef52308f
@@@ -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
Simple merge
index 171ab05ce4fc36f490d5895ca8f99aafc0fd8f0a,1c1c78e74fbb90d7ab50f8bdac18d78d4dc5e570..4ec961ace6887864c740e365ee08fbdf18b8ff50
@@@ -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