Merge tag 'v3.18.22' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.18

Linux 3.18.22

* tag 'v3.18.22' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (178 commits)
  Linux 3.18.22
  net: call rcu_read_lock early in process_backlog
  lpfc: Fix scsi prep dma buf error.
  rds: fix an integer overflow test in rds_info_getsockopt()
  net/mlx4_core: Fix wrong index in propagating port change event to VFs
  netlink: don't hold mutex in rcu callback when releasing mmapd ring
  inet: frags: fix defragmented packet's IP header for af_packet
  bonding: correct the MAC address for "follow" fail_over_mac policy
  bonding: fix destruction of bond with devices different from arphrd_ether
  ipv6: lock socket in ip6_datagram_connect()
  isdn/gigaset: reset tty->receive_room when attaching ser_gigaset
  bridge: mdb: fix double add notification
  net: Fix skb csum races when peeking
  net: do not process device backlog during unregistration
  net: pktgen: fix race between pktgen_thread_worker() and kthread_stop()
  bridge: mdb: zero out the local br_ip variable before use
  net/tipc: initialize security state for new connection socket
  ip_tunnel: fix ipv4 pmtu check to honor inner ip header df
  net: graceful exit from netif_alloc_netdev_queues()
  ipv6: Make MLD packets to only be processed locally
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 9cb8522d8d22..f3d3fb42b873 100755
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -137,7 +137,7 @@ my $ksource = ($ARGV[0] ? $ARGV[0] : '.');
 my $kconfig = $ARGV[1];
 my $lsmod_file = $ENV{'LSMOD'};
 
-my @makefiles = `find $ksource -name Makefile 2>/dev/null`;
+my @makefiles = `find $ksource -name Makefile -or -name Kbuild 2>/dev/null`;
 chomp @makefiles;
 
 my %depends;