Merge remote-tracking branch 'origin/master' into kernel-4.14

diff --cc config/qos/makeqosscripts.pl
Simple merge

diff --cc make.sh
index a41db5413659bd82952ca780751bf860d53be183,c03e464b5108d53f4b9a96053b2358fcc7618948..691444cd9611c6187a1b32db0889018a49f8c001
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -1428,7 -1435,7 +1429,8 @@@ buildipfire() 
    lfsmake2 powertop
    lfsmake2 parted
    lfsmake2 swig
 +  lfsmake2 u-boot
+   lfsmake2 python-typing
    lfsmake2 python-m2crypto
    lfsmake2 wireless-regdb
    lfsmake2 crda