Merge tag 'v4.4-rc2' into drm-intel-next-queued

Linux 4.4-rc2

Backmerge to get at

commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date:   Thu Nov 5 23:04:11 2015 +0200

    drm/i915/skl: disable display side power well support for now

so that we can proplery re-eanble skl power wells in -next.

Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

34 files changed, 1673 insertions, 873 deletions

diff --git a/scripts/.gitignore b/scripts/.gitignore
index 12efbbefd4d7..1f78169d4254 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -8,6 +8,7 @@ unifdef
 ihex2fw
 recordmcount
 docproc
+check-lc_ctype
 sortextable
 asn1_compiler
 extract-cert
diff --git a/scripts/Makefile b/scripts/Makefile
index 1b2661712d44..fd0d53d4a234 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -7,6 +7,7 @@
 # conmakehash:   Create chartable
 # conmakehash:   Create arrays for initializing the kernel console tables
 # docproc:       Used in Documentation/DocBook
+# check-lc_ctype: Used in Documentation/DocBook
 
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 
@@ -27,14 +28,16 @@ HOSTLOADLIBES_extract-cert = -lcrypto
 always          := $(hostprogs-y) $(hostprogs-m)
 
 # The following hostprogs-y programs are only build on demand
-hostprogs-y += unifdef docproc
+hostprogs-y += unifdef docproc check-lc_ctype
 
 # These targets are used internally to avoid "is up to date" messages
-PHONY += build_unifdef build_docproc
+PHONY += build_unifdef build_docproc build_check-lc_ctype
 build_unifdef: $(obj)/unifdef
         @:
 build_docproc: $(obj)/docproc
         @:
+build_check-lc_ctype: $(obj)/check-lc_ctype
+        @:
 
 subdir-$(CONFIG_MODVERSIONS) += genksyms
 subdir-y                     += mod
diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan
index 3f874d24234f..37323b0df374 100644
--- a/scripts/Makefile.kasan
+++ b/scripts/Makefile.kasan
@@ -5,10 +5,12 @@ else
         call_threshold := 0
 endif
 
+KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET)
+
 CFLAGS_KASAN_MINIMAL := -fsanitize=kernel-address
 
 CFLAGS_KASAN := $(call cc-option, -fsanitize=kernel-address \
-                -fasan-shadow-offset=$(CONFIG_KASAN_SHADOW_OFFSET) \
+                -fasan-shadow-offset=$(KASAN_SHADOW_OFFSET) \
                 --param asan-stack=1 --param asan-globals=1 \
                 --param asan-instrumentation-with-call-threshold=$(call_threshold))
 
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 69f0a1417e9a..1366a94b6c39 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -77,6 +77,7 @@ modpost = scripts/mod/modpost                    \
  $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \
  $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
  $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
+ $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)  \
  $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
 
 MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))
diff --git a/scripts/check-lc_ctype.c b/scripts/check-lc_ctype.c
new file mode 100644
index 000000000000..9097ff5449fb
--- /dev/null
+++ b/scripts/check-lc_ctype.c
@@ -0,0 +1,11 @@
+/*
+ * Check that a specified locale works as LC_CTYPE.  Used by the
+ * DocBook build system to probe for C.UTF-8 support.
+ */
+
+#include <locale.h>
+
+int main(void)
+{
+        return !setlocale(LC_CTYPE, "");
+}
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index f2a1131b2f8b..2b3c22808c3b 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -370,6 +370,8 @@ our $typeTypedefs = qr{(?x:
         $typeKernelTypedefs\b
 )};
 
+our $zero_initializer = qr{(?:(?:0[xX])?0+$Int_type?|NULL|false)\b};
+
 our $logFunctions = qr{(?x:
         printk(?:_ratelimited|_once|)|
         (?:[a-z0-9]+_){1,2}(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)|
@@ -2313,42 +2315,43 @@ sub process {
                               "Remove Gerrit Change-Id's before submitting upstream.\n" . $herecurr);
                 }
 
+# Check if the commit log is in a possible stack dump
+                if ($in_commit_log && !$commit_log_possible_stack_dump &&
+                    ($line =~ /^\s*(?:WARNING:|BUG:)/ ||
+                     $line =~ /^\s*\[\s*\d+\.\d{6,6}\s*\]/ ||
+                                        # timestamp
+                     $line =~ /^\s*\[\<[0-9a-fA-F]{8,}\>\]/)) {
+                                        # stack dump address
+                        $commit_log_possible_stack_dump = 1;
+                }
+
 # Check for line lengths > 75 in commit log, warn once
                 if ($in_commit_log && !$commit_log_long_line &&
-                   length($line) > 75 &&
-                   !($line =~ /^\s*[a-zA-Z0-9_\/\.]+\s+\|\s+\d+/ ||
-                                       # file delta changes
-                     $line =~ /^\s*(?:[\w\.\-]+\/)++[\w\.\-]+:/ ||
-                                       # filename then :
-                     $line =~ /^\s*(?:Fixes:|Link:)/i ||
-                                       # A Fixes: or Link: line
-                     $commit_log_possible_stack_dump)) {
+                    length($line) > 75 &&
+                    !($line =~ /^\s*[a-zA-Z0-9_\/\.]+\s+\|\s+\d+/ ||
+                                        # file delta changes
+                      $line =~ /^\s*(?:[\w\.\-]+\/)++[\w\.\-]+:/ ||
+                                        # filename then :
+                      $line =~ /^\s*(?:Fixes:|Link:)/i ||
+                                        # A Fixes: or Link: line
+                      $commit_log_possible_stack_dump)) {
                         WARN("COMMIT_LOG_LONG_LINE",
                              "Possible unwrapped commit description (prefer a maximum 75 chars per line)\n" . $herecurr);
                         $commit_log_long_line = 1;
                 }
 
-# Check if the commit log is in a possible stack dump
-               if ($in_commit_log && !$commit_log_possible_stack_dump &&
-                   ($line =~ /^\s*(?:WARNING:|BUG:)/ ||
-                    $line =~ /^\s*\[\s*\d+\.\d{6,6}\s*\]/ ||
-                               # timestamp
-                    $line =~ /^\s*\[\<[0-9a-fA-F]{8,}\>\]/)) {
-                               # stack dump address
-                       $commit_log_possible_stack_dump = 1;
-               }
-
 # Reset possible stack dump if a blank line is found
-               if ($in_commit_log && $commit_log_possible_stack_dump &&
-                   $line =~ /^\s*$/) {
-                       $commit_log_possible_stack_dump = 0;
-               }
+                if ($in_commit_log && $commit_log_possible_stack_dump &&
+                    $line =~ /^\s*$/) {
+                        $commit_log_possible_stack_dump = 0;
+                }
 
 # Check for git id commit length and improperly formed commit descriptions
-                if ($in_commit_log &&
+                if ($in_commit_log && !$commit_log_possible_stack_dump &&
                     ($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i ||
-                    ($line =~ /\b[0-9a-f]{12,40}\b/i &&
-                     $line !~ /\bfixes:\s*[0-9a-f]{12,40}/i))) {
+                     ($line =~ /\b[0-9a-f]{12,40}\b/i &&
+                      $line !~ /[\<\[][0-9a-f]{12,40}[\>\]]/i &&
+                      $line !~ /\bfixes:\s*[0-9a-f]{12,40}/i))) {
                         my $init_char = "c";
                         my $orig_commit = "";
                         my $short = 1;
@@ -3333,21 +3336,20 @@ sub process {
                 }
 
 # check for global initialisers.
-                if ($line =~ /^\+$Type\s*$Ident(?:\s+$Modifier)*\s*=\s*(?:0|NULL|false)\s*;/) {
+                if ($line =~ /^\+$Type\s*$Ident(?:\s+$Modifier)*\s*=\s*($zero_initializer)\s*;/) {
                         if (ERROR("GLOBAL_INITIALISERS",
-                                  "do not initialise globals to 0 or NULL\n" .
-                                      $herecurr) &&
+                                  "do not initialise globals to $1\n" . $herecurr) &&
                             $fix) {
-                                $fixed[$fixlinenr] =~ s/(^.$Type\s*$Ident(?:\s+$Modifier)*)\s*=\s*(0|NULL|false)\s*;/$1;/;
+                                $fixed[$fixlinenr] =~ s/(^.$Type\s*$Ident(?:\s+$Modifier)*)\s*=\s*$zero_initializer\s*;/$1;/;
                         }
                 }
 # check for static initialisers.
-                if ($line =~ /^\+.*\bstatic\s.*=\s*(0|NULL|false)\s*;/) {
+                if ($line =~ /^\+.*\bstatic\s.*=\s*($zero_initializer)\s*;/) {
                         if (ERROR("INITIALISED_STATIC",
-                                  "do not initialise statics to 0 or NULL\n" .
+                                  "do not initialise statics to $1\n" .
                                       $herecurr) &&
                             $fix) {
-                                $fixed[$fixlinenr] =~ s/(\bstatic\s.*?)\s*=\s*(0|NULL|false)\s*;/$1;/;
+                                $fixed[$fixlinenr] =~ s/(\bstatic\s.*?)\s*=\s*$zero_initializer\s*;/$1;/;
                         }
                 }
 
diff --git a/scripts/coccicheck b/scripts/coccicheck
index bbf901afb606..b2d758188f2f 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -30,7 +30,7 @@ FLAGS="$SPFLAGS --very-quiet"
 # spatch only allows include directories with the syntax "-I include"
 # while gcc also allows "-Iinclude" and "-include include"
 COCCIINCLUDE=${LINUXINCLUDE//-I/-I }
-COCCIINCLUDE=${COCCIINCLUDE//-include/-I}
+COCCIINCLUDE=${COCCIINCLUDE// -include/ --include}
 
 if [ "$C" = "1" -o "$C" = "2" ]; then
     ONLINE=1
diff --git a/scripts/coccinelle/free/ifnullfree.cocci b/scripts/coccinelle/free/ifnullfree.cocci
index a42d70bf88b3..52bd235286fa 100644
--- a/scripts/coccinelle/free/ifnullfree.cocci
+++ b/scripts/coccinelle/free/ifnullfree.cocci
@@ -16,19 +16,21 @@ virtual context
 @r2 depends on patch@
 expression E;
 @@
-- if (E)
+- if (E != NULL)
 (
--       kfree(E);
-+ kfree(E);
+  kfree(E);
 |
--       debugfs_remove(E);
-+ debugfs_remove(E);
+  debugfs_remove(E);
 |
--       debugfs_remove_recursive(E);
-+ debugfs_remove_recursive(E);
+  debugfs_remove_recursive(E);
 |
--       usb_free_urb(E);
-+ usb_free_urb(E);
+  usb_free_urb(E);
+|
+  kmem_cache_destroy(E);
+|
+  mempool_destroy(E);
+|
+  dma_pool_destroy(E);
 )
 
 @r depends on context || report || org @
@@ -36,8 +38,10 @@ expression E;
 position p;
 @@
 
-* if (E)
-*       \(kfree@p\|debugfs_remove@p\|debugfs_remove_recursive@p\|usb_free_urb\)(E);
+* if (E != NULL)
+*       \(kfree@p\|debugfs_remove@p\|debugfs_remove_recursive@p\|
+*         usb_free_urb@p\|kmem_cache_destroy@p\|mempool_destroy@p\|
+*         dma_pool_destroy@p\)(E);
 
 @script:python depends on org@
 p << r.p;
diff --git a/scripts/coccinelle/iterators/device_node_continue.cocci b/scripts/coccinelle/iterators/device_node_continue.cocci
new file mode 100644
index 000000000000..38ab744a4037
--- /dev/null
+++ b/scripts/coccinelle/iterators/device_node_continue.cocci
@@ -0,0 +1,100 @@
+/// Device node iterators put the previous value of the index variable, so an
+/// explicit put causes a double put.
+///
+// Confidence: High
+// Copyright: (C) 2015 Julia Lawall, Inria. GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Options: --no-includes --include-headers
+// Keywords: for_each_child_of_node, etc.
+
+virtual patch
+virtual context
+virtual org
+virtual report
+
+@r exists@
+expression e1,e2;
+local idexpression n;
+iterator name for_each_node_by_name, for_each_node_by_type,
+for_each_compatible_node, for_each_matching_node,
+for_each_matching_node_and_match, for_each_child_of_node,
+for_each_available_child_of_node, for_each_node_with_property;
+iterator i;
+position p1,p2;
+statement S;
+@@
+
+(
+(
+for_each_node_by_name(n,e1) S
+|
+for_each_node_by_type(n,e1) S
+|
+for_each_compatible_node(n,e1,e2) S
+|
+for_each_matching_node(n,e1) S
+|
+for_each_matching_node_and_match(n,e1,e2) S
+|
+for_each_child_of_node(e1,n) S
+|
+for_each_available_child_of_node(e1,n) S
+|
+for_each_node_with_property(n,e1) S
+)
+&
+i@p1(...) {
+   ... when != of_node_get(n)
+       when any
+   of_node_put@p2(n);
+   ... when any
+}
+)
+
+@s exists@
+local idexpression r.n;
+statement S;
+position r.p1,r.p2;
+iterator i;
+@@
+
+ of_node_put@p2(n);
+ ... when any
+ i@p1(..., n, ...)
+ S
+
+@t depends on s && patch && !context && !org && !report@
+local idexpression n;
+position r.p2;
+@@
+
+- of_node_put@p2(n);
+
+// ----------------------------------------------------------------------------
+
+@t_context depends on s && !patch && (context || org || report)@
+local idexpression n;
+position r.p2;
+position j0;
+@@
+
+*  of_node_put@j0@p2(n);
+
+// ----------------------------------------------------------------------------
+
+@script:python t_org depends on org@
+j0 << t_context.j0;
+@@
+
+msg = "ERROR: probable double put."
+coccilib.org.print_todo(j0[0], msg)
+
+// ----------------------------------------------------------------------------
+
+@script:python t_report depends on report@
+j0 << t_context.j0;
+@@
+
+msg = "ERROR: probable double put."
+coccilib.report.print_report(j0[0], msg)
+
diff --git a/scripts/coccinelle/misc/compare_const_fl.cocci b/scripts/coccinelle/misc/compare_const_fl.cocci
new file mode 100644
index 000000000000..b5d4bab60263
--- /dev/null
+++ b/scripts/coccinelle/misc/compare_const_fl.cocci
@@ -0,0 +1,171 @@
+/// Move constants to the right of binary operators.
+//# Depends on personal taste in some cases.
+///
+// Confidence: Moderate
+// Copyright: (C) 2015 Copyright: (C) 2015 Julia Lawall, Inria. GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Options: --no-includes --include-headers
+
+virtual patch
+virtual context
+virtual org
+virtual report
+
+@r1 depends on patch && !context && !org && !report
+ disable bitor_comm, neg_if_exp@
+constant c,c1;
+local idexpression i;
+expression e,e1,e2;
+binary operator b = {==,!=,&,|};
+type t;
+@@
+
+(
+c b (c1)
+|
+sizeof(t) b e1
+|
+sizeof e b e1
+|
+i b e1
+|
+c | e1 | e2 | ...
+|
+c | (e ? e1 : e2)
+|
+- c
++ e
+b
+- e
++ c
+)
+
+@r2 depends on patch && !context && !org && !report
+ disable gtr_lss, gtr_lss_eq, not_int2@
+constant c,c1;
+expression e,e1,e2;
+binary operator b;
+binary operator b1 = {<,<=},b2 = {<,<=};
+binary operator b3 = {>,>=},b4 = {>,>=};
+local idexpression i;
+type t;
+@@
+
+(
+c b c1
+|
+sizeof(t) b e1
+|
+sizeof e b e1
+|
+ (e1 b1 e) && (e b2 e2)
+|
+ (e1 b3 e) && (e b4 e2)
+|
+i b e
+|
+- c < e
++ e > c
+|
+- c <= e
++ e >= c
+|
+- c > e
++ e < c
+|
+- c >= e
++ e <= c
+)
+
+// ----------------------------------------------------------------------------
+
+@r1_context depends on !patch && (context || org || report)
+ disable bitor_comm, neg_if_exp exists@
+type t;
+binary operator b = {==,!=,&,|};
+constant c, c1;
+expression e, e1, e2;
+local idexpression i;
+position j0;
+@@
+
+(
+c b (c1)
+|
+sizeof(t) b e1
+|
+sizeof e b e1
+|
+i b e1
+|
+c | e1 | e2 | ...
+|
+c | (e ? e1 : e2)
+|
+* c@j0 b e
+)
+
+@r2_context depends on !patch && (context || org || report)
+ disable gtr_lss, gtr_lss_eq, not_int2 exists@
+type t;
+binary operator b, b1 = {<,<=}, b2 = {<,<=}, b3 = {>,>=}, b4 = {>,>=};
+constant c, c1;
+expression e, e1, e2;
+local idexpression i;
+position j0;
+@@
+
+(
+c b c1
+|
+sizeof(t) b e1
+|
+sizeof e b e1
+|
+ (e1 b1 e) && (e b2 e2)
+|
+ (e1 b3 e) && (e b4 e2)
+|
+i b e
+|
+* c@j0 < e
+|
+* c@j0 <= e
+|
+* c@j0 > e
+|
+* c@j0 >= e
+)
+
+// ----------------------------------------------------------------------------
+
+@script:python r1_org depends on org@
+j0 << r1_context.j0;
+@@
+
+msg = "Move constant to right."
+coccilib.org.print_todo(j0[0], msg)
+
+@script:python r2_org depends on org@
+j0 << r2_context.j0;
+@@
+
+msg = "Move constant to right."
+coccilib.org.print_todo(j0[0], msg)
+
+// ----------------------------------------------------------------------------
+
+@script:python r1_report depends on report@
+j0 << r1_context.j0;
+@@
+
+msg = "Move constant to right."
+coccilib.report.print_report(j0[0], msg)
+
+@script:python r2_report depends on report@
+j0 << r2_context.j0;
+@@
+
+msg = "Move constant to right."
+coccilib.report.print_report(j0[0], msg)
+
diff --git a/scripts/coccinelle/misc/of_table.cocci b/scripts/coccinelle/misc/of_table.cocci
index 3c934046a060..2294915a19bc 100644
--- a/scripts/coccinelle/misc/of_table.cocci
+++ b/scripts/coccinelle/misc/of_table.cocci
@@ -1,6 +1,6 @@
-/// Make sure of_device_id tables are NULL terminated
+/// Make sure (of/i2c/platform)_device_id tables are NULL terminated
 //
-// Keywords: of_table
+// Keywords: of_table i2c_table platform_table
 // Confidence: Medium
 // Options: --include-headers
 
@@ -13,18 +13,26 @@ virtual report
 identifier var, arr;
 expression E;
 @@
-struct of_device_id arr[] = {
+(
+struct \(of_device_id \| i2c_device_id \| platform_device_id\) arr[] = {
         ...,
         {
         .var = E,
 *       }
 };
+|
+struct \(of_device_id \| i2c_device_id \| platform_device_id\) arr[] = {
+        ...,
+*       { ..., E, ... },
+};
+)
 
 @depends on patch@
 identifier var, arr;
 expression E;
 @@
-struct of_device_id arr[] = {
+(
+struct \(of_device_id \| i2c_device_id \| platform_device_id\) arr[] = {
         ...,
         {
         .var = E,
@@ -32,19 +40,34 @@ struct of_device_id arr[] = {
 +       },
 +       { }
 };
+|
+struct \(of_device_id \| i2c_device_id \| platform_device_id\) arr[] = {
+        ...,
+        { ..., E, ... },
++       { },
+};
+)
 
 @r depends on org || report@
 position p1;
 identifier var, arr;
 expression E;
 @@
-struct of_device_id arr[] = {
+(
+struct \(of_device_id \| i2c_device_id \| platform_device_id\) arr[] = {
         ...,
         {
         .var = E,
         }
         @p1
 };
+|
+struct \(of_device_id \| i2c_device_id \| platform_device_id\) arr[] = {
+        ...,
+        { ..., E, ... }
+        @p1
+};
+)
 
 @script:python depends on org@
 p1 << r.p1;
diff --git a/scripts/coccinelle/misc/simple_return.cocci b/scripts/coccinelle/misc/simple_return.cocci
deleted file mode 100644
index e8b6313b116f..000000000000
--- a/scripts/coccinelle/misc/simple_return.cocci
+++ /dev/null
@@ -1,180 +0,0 @@
-/// Simplify a trivial if-return sequence.  Possibly combine with a
-/// preceding function call.
-///
-// Confidence: High
-// Copyright: (C) 2014 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2014 Gilles Muller, INRIA/LiP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options: --no-includes --include-headers
-
-virtual patch
-virtual context
-virtual org
-virtual report
-
-@r depends on patch@
-local idexpression e;
-identifier i,f,fn;
-@@
-
-fn(...) { <...
-- e@i =
-+ return
-    f(...);
--if (i != 0) return i;
--return 0;
-...> }
-
-@depends on patch@
-identifier r.i;
-type t;
-@@
-
--t i;
- ... when != i
-
-@depends on patch@
-expression e;
-@@
-
--if (e != 0)
-   return e;
--return 0;
-
-// -----------------------------------------------------------------------
-
-@s1 depends on context || org || report@
-local idexpression e;
-identifier i,f,fn;
-position p,p1,p2;
-@@
-
-fn(...) { <...
-* e@i@p = f(...);
-  if (\(i@p1 != 0\|i@p2 < 0\))
-     return i;
-  return 0;
-...> }
-
-@s2 depends on context || org || report forall@
-identifier s1.i;
-type t;
-position q,s1.p;
-expression e,f;
-@@
-
-* t i@q;
-  ... when != i
-  e@p = f(...);
-
-@s3 depends on context || org || report@
-expression e;
-position p1!=s1.p1;
-position p2!=s1.p2;
-@@
-
-*if (\(e@p1 != 0\|e@p2 < 0\))
-   return e;
- return 0;
-
-// -----------------------------------------------------------------------
-
-@script:python depends on org@
-p << s1.p;
-p1 << s1.p1;
-q << s2.q;
-@@
-
-cocci.print_main("decl",q)
-cocci.print_secs("use",p)
-cocci.include_match(False)
-
-@script:python depends on org@
-p << s1.p;
-p2 << s1.p2;
-q << s2.q;
-@@
-
-cocci.print_main("decl",q)
-cocci.print_secs("use with questionable test",p)
-cocci.include_match(False)
-
-@script:python depends on org@
-p << s1.p;
-p1 << s1.p1;
-@@
-
-cocci.print_main("use",p)
-
-@script:python depends on org@
-p << s1.p;
-p2 << s1.p2;
-@@
-
-cocci.print_main("use with questionable test",p)
-
-@script:python depends on org@
-p << s3.p1;
-@@
-
-cocci.print_main("test",p)
-
-@script:python depends on org@
-p << s3.p2;
-@@
-
-cocci.print_main("questionable test",p)
-
-// -----------------------------------------------------------------------
-
-@script:python depends on report@
-p << s1.p;
-p1 << s1.p1;
-q << s2.q;
-@@
-
-msg = "WARNING: end returns can be simpified and declaration on line %s can be dropped" % (q[0].line)
-coccilib.report.print_report(p[0],msg)
-cocci.include_match(False)
-
-@script:python depends on report@
-p << s1.p;
-p1 << s1.p1;
-q << s2.q
-;
-@@
-
-msg = "WARNING: end returns may be simpified if negative or 0 value and declaration on line %s can be dropped" % (q[0].line)
-coccilib.report.print_report(p[0],msg)
-cocci.include_match(False)
-
-@script:python depends on report@
-p << s1.p;
-p1 << s1.p1;
-@@
-
-msg = "WARNING: end returns can be simpified"
-coccilib.report.print_report(p[0],msg)
-
-@script:python depends on report@
-p << s1.p;
-p2 << s1.p2;
-@@
-
-msg = "WARNING: end returns can be simpified if negative or 0 value"
-coccilib.report.print_report(p[0],msg)
-
-@script:python depends on report@
-p << s3.p1;
-@@
-
-msg = "WARNING: end returns can be simpified"
-coccilib.report.print_report(p[0],msg)
-
-@script:python depends on report@
-p << s3.p2;
-@@
-
-msg = "WARNING: end returns can be simpified if tested value is negative or 0"
-coccilib.report.print_report(p[0],msg)
diff --git a/scripts/coccinelle/null/deref_null.cocci b/scripts/coccinelle/null/deref_null.cocci
index cdac6cfcce92..f192d6035d02 100644
--- a/scripts/coccinelle/null/deref_null.cocci
+++ b/scripts/coccinelle/null/deref_null.cocci
@@ -1,6 +1,6 @@
 ///
-/// A variable is dereference under a NULL test.
-/// Even though it is know to be NULL.
+/// A variable is dereferenced under a NULL test.
+/// Even though it is known to be NULL.
 ///
 // Confidence: Moderate
 // Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
diff --git a/scripts/coccinelle/tests/odd_ptr_err.cocci b/scripts/coccinelle/tests/odd_ptr_err.cocci
index cfe0a35cf2dd..dfc6b40c2969 100644
--- a/scripts/coccinelle/tests/odd_ptr_err.cocci
+++ b/scripts/coccinelle/tests/odd_ptr_err.cocci
@@ -1,12 +1,11 @@
 /// PTR_ERR should access the value just tested by IS_ERR
-//# There can be false positives in the patch case, where it is the call
+//# There can be false positives in the patch case, where it is the call to
 //# IS_ERR that is wrong.
 ///
 // Confidence: High
-// Copyright: (C) 2012 Julia Lawall, INRIA.  GPLv2.
-// Copyright: (C) 2012 Gilles Muller, INRIA.  GPLv2.
+// Copyright: (C) 2012, 2015 Julia Lawall, INRIA.  GPLv2.
+// Copyright: (C) 2012, 2015 Gilles Muller, INRIA.  GPLv2.
 // URL: http://coccinelle.lip6.fr/
-// Comments:
 // Options: --no-includes --include-headers
 
 virtual patch
@@ -14,52 +13,105 @@ virtual context
 virtual org
 virtual report
 
-@depends on patch@
-expression e,e1;
+@ok1 exists@
+expression x,e;
+position p;
 @@
 
+if (IS_ERR(x=e) || ...) {
+  <...
+   PTR_ERR@p(x)
+  ...>
+}
+
+@ok2 exists@
+expression x,e1,e2;
+position p;
+@@
+
+if (IS_ERR(x) || ...) {
+  <...
 (
-if (IS_ERR(e)) { ... PTR_ERR(e) ... }
+   PTR_ERR@p(\(e1 ? e2 : x\|e1 ? x : e2\))
 |
-if (IS_ERR(e=e1)) { ... PTR_ERR(e) ... }
+   PTR_ERR@p(x)
+)
+  ...>
+}
+
+@r1 depends on patch && !context && !org && !report exists@
+expression x,y;
+position p != {ok1.p,ok2.p};
+@@
+
+if (IS_ERR(x) || ...) {
+  ... when any
+      when != IS_ERR(...)
+(
+  PTR_ERR(x)
 |
-if (IS_ERR(e))
- { ...
-  PTR_ERR(
--   e1
-+   e
+  PTR_ERR@p(
+-     y
++     x
   )
-   ... }
 )
+  ... when any
+}
+
+// ----------------------------------------------------------------------------
 
-@r depends on !patch@
-expression e,e1;
-position p1,p2;
+@r1_context depends on !patch && (context || org || report) exists@
+position p != {ok1.p,ok2.p};
+expression x, y;
+position j0, j1;
 @@
 
+if (IS_ERR@j0(x) || ...) {
+  ... when any
+      when != IS_ERR(...)
 (
-if (IS_ERR(e)) { ... PTR_ERR(e) ... }
+  PTR_ERR(x)
 |
-if (IS_ERR(e=e1)) { ... PTR_ERR(e) ... }
-|
-*if (IS_ERR@p1(e))
- { ...
-*  PTR_ERR@p2(e1)
-   ... }
+  PTR_ERR@j1@p(
+     y
+  )
 )
+  ... when any
+}
 
-@script:python depends on org@
-p1 << r.p1;
-p2 << r.p2;
+@r1_disj depends on !patch && (context || org || report) exists@
+position p != {ok1.p,ok2.p};
+expression x, y;
+position r1_context.j0, r1_context.j1;
 @@
 
-cocci.print_main("inconsistent IS_ERR and PTR_ERR",p1)
-cocci.print_secs("PTR_ERR",p2)
+* if (IS_ERR@j0(x) || ...) {
+  ... when any
+      when != IS_ERR(...)
+*   PTR_ERR@j1@p(
+     y
+  )
+  ... when any
+}
 
-@script:python depends on report@
-p1 << r.p1;
-p2 << r.p2;
+// ----------------------------------------------------------------------------
+
+@script:python r1_org depends on org@
+j0 << r1_context.j0;
+j1 << r1_context.j1;
 @@
 
-msg = "inconsistent IS_ERR and PTR_ERR, PTR_ERR on line %s" % (p2[0].line)
-coccilib.report.print_report(p1[0],msg)
+msg = "inconsistent IS_ERR and PTR_ERR"
+coccilib.org.print_todo(j0[0], msg)
+coccilib.org.print_link(j1[0], "")
+
+// ----------------------------------------------------------------------------
+
+@script:python r1_report depends on report@
+j0 << r1_context.j0;
+j1 << r1_context.j1;
+@@
+
+msg = "inconsistent IS_ERR and PTR_ERR on line %s." % (j1[0].line)
+coccilib.report.print_report(j0[0], msg)
+
diff --git a/scripts/extract-cert.c b/scripts/extract-cert.c
index 6ce5945a0b89..b071bf476fea 100644
--- a/scripts/extract-cert.c
+++ b/scripts/extract-cert.c
@@ -17,13 +17,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include <getopt.h>
 #include <err.h>
-#include <arpa/inet.h>
 #include <openssl/bio.h>
-#include <openssl/evp.h>
 #include <openssl/pem.h>
-#include <openssl/pkcs7.h>
 #include <openssl/err.h>
 #include <openssl/engine.h>
 
diff --git a/scripts/extract-module-sig.pl b/scripts/extract-module-sig.pl
new file mode 100755
index 000000000000..faac6f2e377f
--- /dev/null
+++ b/scripts/extract-module-sig.pl
@@ -0,0 +1,136 @@
+#!/usr/bin/perl -w
+#
+# extract-mod-sig <part> <module-file>
+#
+# Reads the module file and writes out some or all of the signature
+# section to stdout.  Part is the bit to be written and is one of:
+#
+#  -0: The unsigned module, no signature data at all
+#  -a: All of the signature data, including magic number
+#  -d: Just the descriptor values as a sequence of numbers
+#  -n: Just the signer's name
+#  -k: Just the key ID
+#  -s: Just the crypto signature or PKCS#7 message
+#
+use strict;
+
+die "Format: $0 -[0adnks] module-file >out\n"
+    if ($#ARGV != 1);
+
+my $part = $ARGV[0];
+my $modfile = $ARGV[1];
+
+my $magic_number = "~Module signature appended~\n";
+
+#
+# Read the module contents
+#
+open FD, "<$modfile" || die $modfile;
+binmode(FD);
+my @st = stat(FD);
+die "$modfile" unless (@st);
+my $buf = "";
+my $len = sysread(FD, $buf, $st[7]);
+die "$modfile" unless (defined($len));
+die "Short read on $modfile\n" unless ($len == $st[7]);
+close(FD) || die $modfile;
+
+print STDERR "Read ", $len, " bytes from module file\n";
+
+die "The file is too short to have a sig magic number and descriptor\n"
+    if ($len < 12 + length($magic_number));
+
+#
+# Check for the magic number and extract the information block
+#
+my $p = $len - length($magic_number);
+my $raw_magic = substr($buf, $p);
+
+die "Magic number not found at $len\n"
+    if ($raw_magic ne $magic_number);
+print STDERR "Found magic number at $len\n";
+
+$p -= 12;
+my $raw_info = substr($buf, $p, 12);
+
+my @info = unpack("CCCCCxxxN", $raw_info);
+my ($algo, $hash, $id_type, $name_len, $kid_len, $sig_len) = @info;
+
+if ($id_type == 0) {
+    print STDERR "Found PGP key identifier\n";
+} elsif ($id_type == 1) {
+    print STDERR "Found X.509 cert identifier\n";
+} elsif ($id_type == 2) {
+    print STDERR "Found PKCS#7/CMS encapsulation\n";
+} else {
+    print STDERR "Found unsupported identifier type $id_type\n";
+}
+
+#
+# Extract the three pieces of info data
+#
+die "Insufficient name+kid+sig data in file\n"
+    unless ($p >= $name_len + $kid_len + $sig_len);
+
+$p -= $sig_len;
+my $raw_sig = substr($buf, $p, $sig_len);
+$p -= $kid_len;
+my $raw_kid = substr($buf, $p, $kid_len);
+$p -= $name_len;
+my $raw_name = substr($buf, $p, $name_len);
+
+my $module_len = $p;
+
+if ($sig_len > 0) {
+    print STDERR "Found $sig_len bytes of signature [";
+    my $n = $sig_len > 16 ? 16 : $sig_len;
+    foreach my $i (unpack("C" x $n, substr($raw_sig, 0, $n))) {
+        printf STDERR "%02x", $i;
+    }
+    print STDERR "]\n";
+}
+
+if ($kid_len > 0) {
+    print STDERR "Found $kid_len bytes of key identifier [";
+    my $n = $kid_len > 16 ? 16 : $kid_len;
+    foreach my $i (unpack("C" x $n, substr($raw_kid, 0, $n))) {
+        printf STDERR "%02x", $i;
+    }
+    print STDERR "]\n";
+}
+
+if ($name_len > 0) {
+    print STDERR "Found $name_len bytes of signer's name [$raw_name]\n";
+}
+
+#
+# Produce the requested output
+#
+if ($part eq "-0") {
+    # The unsigned module, no signature data at all
+    binmode(STDOUT);
+    print substr($buf, 0, $module_len);
+} elsif ($part eq "-a") {
+    # All of the signature data, including magic number
+    binmode(STDOUT);
+    print substr($buf, $module_len);
+} elsif ($part eq "-d") {
+    # Just the descriptor values as a sequence of numbers
+    print join(" ", @info), "\n";
+} elsif ($part eq "-n") {
+    # Just the signer's name
+    print STDERR "No signer's name for PKCS#7 message type sig\n"
+        if ($id_type == 2);
+    binmode(STDOUT);
+    print $raw_name;
+} elsif ($part eq "-k") {
+    # Just the key identifier
+    print STDERR "No key ID for PKCS#7 message type sig\n"
+        if ($id_type == 2);
+    binmode(STDOUT);
+    print $raw_kid;
+} elsif ($part eq "-s") {
+    # Just the crypto signature or PKCS#7 message
+    binmode(STDOUT);
+    print $raw_sig;
+}
diff --git a/scripts/extract-sys-certs.pl b/scripts/extract-sys-certs.pl
new file mode 100755
index 000000000000..d476e7d1fd88
--- /dev/null
+++ b/scripts/extract-sys-certs.pl
@@ -0,0 +1,144 @@
+#!/usr/bin/perl -w
+#
+use strict;
+use Math::BigInt;
+use Fcntl "SEEK_SET";
+
+die "Format: $0 [-s <systemmap-file>] <vmlinux-file> <keyring-file>\n"
+    if ($#ARGV != 1 && $#ARGV != 3 ||
+        $#ARGV == 3 && $ARGV[0] ne "-s");
+
+my $sysmap = "";
+if ($#ARGV == 3) {
+    shift;
+    $sysmap = $ARGV[0];
+    shift;
+}
+
+my $vmlinux = $ARGV[0];
+my $keyring = $ARGV[1];
+
+#
+# Parse the vmlinux section table
+#
+open FD, "objdump -h $vmlinux |" || die $vmlinux;
+my @lines = <FD>;
+close(FD) || die $vmlinux;
+
+my @sections = ();
+
+foreach my $line (@lines) {
+    chomp($line);
+    if ($line =~ /\s*([0-9]+)\s+(\S+)\s+([0-9a-f]+)\s+([0-9a-f]+)\s+([0-9a-f]+)\s+([0-9a-f]+)\s+2[*][*]([0-9]+)/
+        ) {
+        my $seg  = $1;
+        my $name = $2;
+        my $len  = Math::BigInt->new("0x" . $3);
+        my $vma  = Math::BigInt->new("0x" . $4);
+        my $lma  = Math::BigInt->new("0x" . $5);
+        my $foff = Math::BigInt->new("0x" . $6);
+        my $align = 2 ** $7;
+
+        push @sections, { name => $name,
+                          vma => $vma,
+                          len => $len,
+                          foff => $foff };
+    }
+}
+
+print "Have $#sections sections\n";
+
+#
+# Try and parse the vmlinux symbol table.  If the vmlinux file has been created
+# from a vmlinuz file with extract-vmlinux then the symbol table will be empty.
+#
+open FD, "nm $vmlinux 2>/dev/null |" || die $vmlinux;
+@lines = <FD>;
+close(FD) || die $vmlinux;
+
+my %symbols = ();
+my $nr_symbols = 0;
+
+sub parse_symbols(@) {
+    foreach my $line (@_) {
+        chomp($line);
+        if ($line =~ /([0-9a-f]+)\s([a-zA-Z])\s(\S+)/
+            ) {
+            my $addr = "0x" . $1;
+            my $type = $2;
+            my $name = $3;
+
+            $symbols{$name} = $addr;
+            $nr_symbols++;
+        }
+    }
+}
+parse_symbols(@lines);
+
+if ($nr_symbols == 0 && $sysmap ne "") {
+    print "No symbols in vmlinux, trying $sysmap\n";
+
+    open FD, "<$sysmap" || die $sysmap;
+    @lines = <FD>;
+    close(FD) || die $sysmap;
+    parse_symbols(@lines);
+}
+
+die "No symbols available\n"
+    if ($nr_symbols == 0);
+
+print "Have $nr_symbols symbols\n";
+
+die "Can't find system certificate list"
+    unless (exists($symbols{"__cert_list_start"}) &&
+            exists($symbols{"__cert_list_end"}));
+
+my $start = Math::BigInt->new($symbols{"__cert_list_start"});
+my $end = Math::BigInt->new($symbols{"__cert_list_end"});
+my $size = $end - $start;
+
+printf "Have %u bytes of certs at VMA 0x%x\n", $size, $start;
+
+my $s = undef;
+foreach my $sec (@sections) {
+    my $s_name = $sec->{name};
+    my $s_vma = $sec->{vma};
+    my $s_len = $sec->{len};
+    my $s_foff = $sec->{foff};
+    my $s_vend = $s_vma + $s_len;
+
+    next unless ($start >= $s_vma);
+    next if ($start >= $s_vend);
+
+    die "Cert object partially overflows section $s_name\n"
+        if ($end > $s_vend);
+
+    die "Cert object in multiple sections: ", $s_name, " and ", $s->{name}, "\n"
+        if ($s);
+    $s = $sec;
+}
+
+die "Cert object not inside a section\n"
+    unless ($s);
+
+print "Certificate list in section ", $s->{name}, "\n";
+
+my $foff = $start - $s->{vma} + $s->{foff};
+
+printf "Certificate list at file offset 0x%x\n", $foff;
+
+open FD, "<$vmlinux" || die $vmlinux;
+binmode(FD);
+die $vmlinux if (!defined(sysseek(FD, $foff, SEEK_SET)));
+my $buf = "";
+my $len = sysread(FD, $buf, $size);
+die "$vmlinux" if (!defined($len));
+die "Short read on $vmlinux\n" if ($len != $size);
+close(FD) || die $vmlinux;
+
+open FD, ">$keyring" || die $keyring;
+binmode(FD);
+$len = syswrite(FD, $buf, $size);
+die "$keyring" if (!defined($len));
+die "Short write on $keyring\n" if ($len != $size);
+close(FD) || die $keyring;
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 98bae869f6d0..cab641a12dd5 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -781,6 +781,7 @@ MAINTAINER field selection options:
     --git-max-maintainers => maximum maintainers to add (default: $email_git_max_maintainers)
     --git-min-percent => minimum percentage of commits required (default: $email_git_min_percent)
     --git-blame => use git blame to find modified commits for patch or file
+    --git-blame-signatures => when used with --git-blame, also include all commit signers
     --git-since => git history to use (default: $email_git_since)
     --hg-since => hg history to use (default: $email_hg_since)
     --interactive => display a menu (mostly useful if used with the --git option)
@@ -812,7 +813,7 @@ Other options:
   --help => show this help information
 
 Default options:
-  [--email --nogit --git-fallback --m --n --l --multiline -pattern-depth=0
+  [--email --nogit --git-fallback --m --r --n --l --multiline --pattern-depth=0
    --remove-duplicates --rolestats]
 
 Notes:
@@ -844,6 +845,9 @@ Notes:
       Entries in this file can be any command line argument.
       This file is prepended to any additional command line arguments.
       Multiple lines and # comments are allowed.
+  Most options have both positive and negative forms.
+      The negative forms for --<foo> are --no<foo> and --no-<foo>.
+
 EOT
 }
 
@@ -970,20 +974,29 @@ sub find_ending_index {
     return $index;
 }
 
-sub get_maintainer_role {
+sub get_subsystem_name {
     my ($index) = @_;
 
-    my $i;
     my $start = find_starting_index($index);
-    my $end = find_ending_index($index);
 
-    my $role = "unknown";
     my $subsystem = $typevalue[$start];
     if ($output_section_maxlen && length($subsystem) > $output_section_maxlen) {
         $subsystem = substr($subsystem, 0, $output_section_maxlen - 3);
         $subsystem =~ s/\s*$//;
         $subsystem = $subsystem . "...";
     }
+    return $subsystem;
+}
+
+sub get_maintainer_role {
+    my ($index) = @_;
+
+    my $i;
+    my $start = find_starting_index($index);
+    my $end = find_ending_index($index);
+
+    my $role = "unknown";
+    my $subsystem = get_subsystem_name($index);
 
     for ($i = $start + 1; $i < $end; $i++) {
         my $tv = $typevalue[$i];
@@ -1017,16 +1030,7 @@ sub get_maintainer_role {
 sub get_list_role {
     my ($index) = @_;
 
-    my $i;
-    my $start = find_starting_index($index);
-    my $end = find_ending_index($index);
-
-    my $subsystem = $typevalue[$start];
-    if ($output_section_maxlen && length($subsystem) > $output_section_maxlen) {
-        $subsystem = substr($subsystem, 0, $output_section_maxlen - 3);
-        $subsystem =~ s/\s*$//;
-        $subsystem = $subsystem . "...";
-    }
+    my $subsystem = get_subsystem_name($index);
 
     if ($subsystem eq "THE REST") {
         $subsystem = "";
@@ -1114,7 +1118,8 @@ sub add_categories {
                     }
                 }
                 if ($email_reviewer) {
-                    push_email_addresses($pvalue, 'reviewer');
+                    my $subsystem = get_subsystem_name($i);
+                    push_email_addresses($pvalue, "reviewer:$subsystem");
                 }
             } elsif ($ptype eq "T") {
                 push(@scm, $pvalue);
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index aceaaed09811..d79cba4ce3eb 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -96,9 +96,12 @@ savedefconfig: $(obj)/conf
 defconfig: $(obj)/conf
 ifeq ($(KBUILD_DEFCONFIG),)
         $< $(silent) --defconfig $(Kconfig)
-else
+else ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
         @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
         $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
+else
+        @$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'"
+        $(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)
 endif
 
 %_defconfig: $(obj)/conf
@@ -226,49 +229,21 @@ $(obj)/.tmp_qtcheck: $(src)/Makefile
 
 # Qt needs some extra effort...
 $(obj)/.tmp_qtcheck:
-        @set -e; $(kecho) "  CHECK   qt"; dir=""; pkg=""; \
-        if ! pkg-config --exists QtCore 2> /dev/null; then \
-            echo "* Unable to find the Qt4 tool qmake. Trying to use Qt3"; \
-            pkg-config --exists qt 2> /dev/null && pkg=qt; \
-            pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \
-            if [ -n "$$pkg" ]; then \
-              cflags="\$$(shell pkg-config $$pkg --cflags)"; \
-              libs="\$$(shell pkg-config $$pkg --libs)"; \
-              moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \
-              dir="$$(pkg-config $$pkg --variable=prefix)"; \
-            else \
-              for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
-                if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \
-              done; \
-              if [ -z "$$dir" ]; then \
-                echo >&2 "*"; \
-                echo >&2 "* Unable to find any Qt installation. Please make sure that"; \
-                echo >&2 "* the Qt4 or Qt3 development package is correctly installed and"; \
-                echo >&2 "* either qmake can be found or install pkg-config or set"; \
-                echo >&2 "* the QTDIR environment variable to the correct location."; \
-                echo >&2 "*"; \
-                false; \
-              fi; \
-              libpath=$$dir/lib; lib=qt; osdir=""; \
-              $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
-                osdir=x$$($(HOSTCXX) -print-multi-os-directory); \
-              test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \
-              test -f $$libpath/libqt-mt.so && lib=qt-mt; \
-              cflags="-I$$dir/include"; \
-              libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \
-              moc="$$dir/bin/moc"; \
-            fi; \
-            if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \
-              echo "*"; \
-              echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \
-              echo "*"; \
-              moc="/usr/bin/moc"; \
-            fi; \
+        @set -e; $(kecho) "  CHECK   qt"; \
+        if pkg-config --exists Qt5Core; then \
+            cflags="-std=c++11 -fPIC `pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets`"; \
+            libs=`pkg-config --libs Qt5Core Qt5Gui Qt5Widgets`; \
+            moc=`pkg-config --variable=host_bins Qt5Core`/moc; \
+        elif pkg-config --exists QtCore; then \
+            cflags=`pkg-config --cflags QtCore QtGui`; \
+            libs=`pkg-config --libs QtCore QtGui`; \
+            moc=`pkg-config --variable=moc_location QtCore`; \
         else \
-          cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \
-          libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \
-          moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \
-          [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \
+            echo >&2 "*"; \
+            echo >&2 "* Could not find Qt via pkg-config."; \
+            echo >&2 "* Please install either Qt 4.8 or 5.x. and make sure it's in PKG_CONFIG_PATH"; \
+            echo >&2 "*"; \
+            exit 1; \
         fi; \
         echo "KC_QT_CFLAGS=$$cflags" > $@; \
         echo "KC_QT_LIBS=$$libs" >> $@; \
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index 667d1aa23711..cbf4996dd9c1 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -1113,7 +1113,7 @@ void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *
                         fn(data, e->left.sym, e->left.sym->name);
                 else
                         fn(data, NULL, "<choice>");
-                fn(data, NULL, e->type == E_LEQ ? ">=" : ">");
+                fn(data, NULL, e->type == E_GEQ ? ">=" : ">");
                 fn(data, e->right.sym, e->right.sym->name);
                 break;
         case E_UNEQUAL:
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 0d883b37882a..67d131447631 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -32,7 +32,7 @@ usage() {
         echo "  -m    only merge the fragments, do not execute the make command"
         echo "  -n    use allnoconfig instead of alldefconfig"
         echo "  -r    list redundant entries when merging fragments"
-        echo "  -O    dir to put generated output files"
+        echo "  -O    dir to put generated output files.  Consider setting \$KCONFIG_CONFIG instead."
 }
 
 RUNMAKE=true
@@ -77,11 +77,19 @@ while true; do
         esac
 done
 
-if [ "$#" -lt 2 ] ; then
+if [ "$#" -lt 1 ] ; then
         usage
         exit
 fi
 
+if [ -z "$KCONFIG_CONFIG" ]; then
+        if [ "$OUTPUT" != . ]; then
+                KCONFIG_CONFIG=$(readlink -m -- "$OUTPUT/.config")
+        else
+                KCONFIG_CONFIG=.config
+        fi
+fi
+
 INITFILE=$1
 shift;
 
@@ -124,9 +132,9 @@ for MERGE_FILE in $MERGE_LIST ; do
 done
 
 if [ "$RUNMAKE" = "false" ]; then
-        cp $TMP_FILE $OUTPUT/.config
+        cp -T -- "$TMP_FILE" "$KCONFIG_CONFIG"
         echo "#"
-        echo "# merged configuration written to $OUTPUT/.config (needs make)"
+        echo "# merged configuration written to $KCONFIG_CONFIG (needs make)"
         echo "#"
         clean_up
         exit
@@ -150,7 +158,7 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
 for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
 
         REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
-        ACTUAL_VAL=$(grep -w -e "$CFG" $OUTPUT/.config)
+        ACTUAL_VAL=$(grep -w -e "$CFG" "$KCONFIG_CONFIG")
         if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then
                 echo "Value requested for $CFG not in final .config"
                 echo "Requested value:  $REQUESTED_VAL"
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index c3bb7fe8dfa6..91b7e6fbc364 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1,32 +1,17 @@
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Copyright (C) 2015 Boris Barbulovski <bbarbulovski@gmail.com>
  * Released under the terms of the GNU GPL v2.0.
  */
 
 #include <qglobal.h>
 
-#if QT_VERSION < 0x040000
-#include <stddef.h>
-#include <qmainwindow.h>
-#include <qvbox.h>
-#include <qvaluelist.h>
+#include <QMainWindow>
+#include <QList>
 #include <qtextbrowser.h>
-#include <qaction.h>
-#include <qheader.h>
-#include <qfiledialog.h>
-#include <qdragobject.h>
-#include <qpopupmenu.h>
-#else
-#include <q3mainwindow.h>
-#include <q3vbox.h>
-#include <q3valuelist.h>
-#include <q3textbrowser.h>
-#include <q3action.h>
-#include <q3header.h>
-#include <q3filedialog.h>
-#include <q3dragobject.h>
-#include <q3popupmenu.h>
-#endif
+#include <QAction>
+#include <QFileDialog>
+#include <QMenu>
 
 #include <qapplication.h>
 #include <qdesktopwidget.h>
@@ -57,7 +42,7 @@
 static QApplication *configApp;
 static ConfigSettings *configSettings;
 
-Q3Action *ConfigMainWindow::saveAction;
+QAction *ConfigMainWindow::saveAction;
 
 static inline QString qgettext(const char* str)
 {
@@ -66,7 +51,7 @@ static inline QString qgettext(const char* str)
 
 static inline QString qgettext(const QString& str)
 {
-        return QString::fromLocal8Bit(gettext(str.latin1()));
+        return QString::fromLocal8Bit(gettext(str.toLatin1()));
 }
 
 ConfigSettings::ConfigSettings()
@@ -77,10 +62,10 @@ ConfigSettings::ConfigSettings()
 /**
  * Reads a list of integer values from the application settings.
  */
-Q3ValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok)
+QList<int> ConfigSettings::readSizes(const QString& key, bool *ok)
 {
-        Q3ValueList<int> result;
-        QStringList entryList = readListEntry(key, ok);
+        QList<int> result;
+        QStringList entryList = value(key).toStringList();
         QStringList::Iterator it;
 
         for (it = entryList.begin(); it != entryList.end(); ++it)
@@ -92,14 +77,16 @@ Q3ValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok)
 /**
  * Writes a list of integer values to the application settings.
  */
-bool ConfigSettings::writeSizes(const QString& key, const Q3ValueList<int>& value)
+bool ConfigSettings::writeSizes(const QString& key, const QList<int>& value)
 {
         QStringList stringList;
-        Q3ValueList<int>::ConstIterator it;
+        QList<int>::ConstIterator it;
 
         for (it = value.begin(); it != value.end(); ++it)
                 stringList.push_back(QString::number(*it));
-        return writeEntry(key, stringList);
+        setValue(key, stringList);
+
+        return true;
 }
 
 
@@ -109,9 +96,6 @@ bool ConfigSettings::writeSizes(const QString& key, const Q3ValueList<int>& valu
  */
 void ConfigItem::okRename(int col)
 {
-        Parent::okRename(col);
-        sym_set_string_value(menu->sym, text(dataColIdx).latin1());
-        listView()->updateList(this);
 }
 
 /*
@@ -149,11 +133,11 @@ void ConfigItem::updateMenu(void)
                 } else {
                         if (sym)
                                 break;
-                        setPixmap(promptColIdx, 0);
+                        setPixmap(promptColIdx, QIcon());
                 }
                 goto set_prompt;
         case P_COMMENT:
-                setPixmap(promptColIdx, 0);
+                setPixmap(promptColIdx, QIcon());
                 goto set_prompt;
         default:
                 ;
@@ -170,7 +154,7 @@ void ConfigItem::updateMenu(void)
                 char ch;
 
                 if (!sym_is_changable(sym) && list->optMode == normalOpt) {
-                        setPixmap(promptColIdx, 0);
+                        setPixmap(promptColIdx, QIcon());
                         setText(noColIdx, QString::null);
                         setText(modColIdx, QString::null);
                         setText(yesColIdx, QString::null);
@@ -216,9 +200,6 @@ void ConfigItem::updateMenu(void)
 
                 data = sym_get_string_value(sym);
 
-                int i = list->mapIdx(dataColIdx);
-                if (i >= 0)
-                        setRenameEnabled(i, TRUE);
                 setText(dataColIdx, data);
                 if (type == S_STRING)
                         prompt = QString("%1: %2").arg(prompt).arg(data);
@@ -250,18 +231,6 @@ void ConfigItem::testUpdateMenu(bool v)
                 updateMenu();
 }
 
-void ConfigItem::paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align)
-{
-        ConfigList* list = listView();
-
-        if (visible) {
-                if (isSelected() && !list->hasFocus() && list->mode == menuMode)
-                        Parent::paintCell(p, list->inactivedColorGroup, column, width, align);
-                else
-                        Parent::paintCell(p, cg, column, width, align);
-        } else
-                Parent::paintCell(p, list->disabledColorGroup, column, width, align);
-}
 
 /*
  * construct a menu entry
@@ -274,7 +243,7 @@ void ConfigItem::init(void)
                 menu->data = this;
 
                 if (list->mode != fullMode)
-                        setOpen(TRUE);
+                        setExpanded(true);
                 sym_calc_value(menu->sym);
         }
         updateMenu();
@@ -299,7 +268,7 @@ ConfigItem::~ConfigItem(void)
 ConfigLineEdit::ConfigLineEdit(ConfigView* parent)
         : Parent(parent)
 {
-        connect(this, SIGNAL(lostFocus()), SLOT(hide()));
+        connect(this, SIGNAL(editingFinished()), SLOT(hide()));
 }
 
 void ConfigLineEdit::show(ConfigItem* i)
@@ -320,7 +289,7 @@ void ConfigLineEdit::keyPressEvent(QKeyEvent* e)
                 break;
         case Qt::Key_Return:
         case Qt::Key_Enter:
-                sym_set_string_value(item->menu->sym, text().latin1());
+                sym_set_string_value(item->menu->sym, text().toLatin1());
                 parent()->updateList(item);
                 break;
         default:
@@ -333,39 +302,39 @@ void ConfigLineEdit::keyPressEvent(QKeyEvent* e)
 }
 
 ConfigList::ConfigList(ConfigView* p, const char *name)
-        : Parent(p, name),
+        : Parent(p),
           updateAll(false),
           symbolYesPix(xpm_symbol_yes), symbolModPix(xpm_symbol_mod), symbolNoPix(xpm_symbol_no),
           choiceYesPix(xpm_choice_yes), choiceNoPix(xpm_choice_no),
           menuPix(xpm_menu), menuInvPix(xpm_menu_inv), menuBackPix(xpm_menuback), voidPix(xpm_void),
-          showName(false), showRange(false), showData(false), optMode(normalOpt),
+          showName(false), showRange(false), showData(false), mode(singleMode), optMode(normalOpt),
           rootEntry(0), headerPopup(0)
 {
         int i;
 
-        setSorting(-1);
-        setRootIsDecorated(TRUE);
-        disabledColorGroup = palette().active();
-        disabledColorGroup.setColor(QColorGroup::Text, palette().disabled().text());
-        inactivedColorGroup = palette().active();
-        inactivedColorGroup.setColor(QColorGroup::Highlight, palette().disabled().highlight());
+        setObjectName(name);
+        setSortingEnabled(false);
+        setRootIsDecorated(true);
+
+        setVerticalScrollMode(ScrollPerPixel);
+        setHorizontalScrollMode(ScrollPerPixel);
+
+        setHeaderLabels(QStringList() << _("Option") << _("Name") << "N" << "M" << "Y" << _("Value"));
 
-        connect(this, SIGNAL(selectionChanged(void)),
+        connect(this, SIGNAL(itemSelectionChanged(void)),
                 SLOT(updateSelection(void)));
 
         if (name) {
                 configSettings->beginGroup(name);
-                showName = configSettings->readBoolEntry("/showName", false);
-                showRange = configSettings->readBoolEntry("/showRange", false);
-                showData = configSettings->readBoolEntry("/showData", false);
-                optMode = (enum optionMode)configSettings->readNumEntry("/optionMode", false);
+                showName = configSettings->value("/showName", false).toBool();
+                showRange = configSettings->value("/showRange", false).toBool();
+                showData = configSettings->value("/showData", false).toBool();
+                optMode = (enum optionMode)configSettings->value("/optionMode", 0).toInt();
                 configSettings->endGroup();
                 connect(configApp, SIGNAL(aboutToQuit()), SLOT(saveSettings()));
         }
 
-        for (i = 0; i < colNr; i++)
-                colMap[i] = colRevMap[i] = -1;
-        addColumn(promptColIdx, _("Option"));
+        addColumn(promptColIdx);
 
         reinit();
 }
@@ -390,26 +359,26 @@ void ConfigList::reinit(void)
         removeColumn(nameColIdx);
 
         if (showName)
-                addColumn(nameColIdx, _("Name"));
+                addColumn(nameColIdx);
         if (showRange) {
-                addColumn(noColIdx, "N");
-                addColumn(modColIdx, "M");
-                addColumn(yesColIdx, "Y");
+                addColumn(noColIdx);
+                addColumn(modColIdx);
+                addColumn(yesColIdx);
         }
         if (showData)
-                addColumn(dataColIdx, _("Value"));
+                addColumn(dataColIdx);
 
         updateListAll();
 }
 
 void ConfigList::saveSettings(void)
 {
-        if (name()) {
-                configSettings->beginGroup(name());
-                configSettings->writeEntry("/showName", showName);
-                configSettings->writeEntry("/showRange", showRange);
-                configSettings->writeEntry("/showData", showData);
-                configSettings->writeEntry("/optionMode", (int)optMode);
+        if (!objectName().isEmpty()) {
+                configSettings->beginGroup(objectName());
+                configSettings->setValue("/showName", showName);
+                configSettings->setValue("/showRange", showRange);
+                configSettings->setValue("/showData", showData);
+                configSettings->setValue("/optionMode", (int)optMode);
                 configSettings->endGroup();
         }
 }
@@ -431,7 +400,10 @@ void ConfigList::updateSelection(void)
         struct menu *menu;
         enum prop_type type;
 
-        ConfigItem* item = (ConfigItem*)selectedItem();
+        if (selectedItems().count() == 0)
+                return;
+
+        ConfigItem* item = (ConfigItem*)selectedItems().first();
         if (!item)
                 return;
 
@@ -451,21 +423,23 @@ void ConfigList::updateList(ConfigItem* item)
         if (!rootEntry) {
                 if (mode != listMode)
                         goto update;
-                Q3ListViewItemIterator it(this);
+                QTreeWidgetItemIterator it(this);
                 ConfigItem* item;
 
-                for (; it.current(); ++it) {
-                        item = (ConfigItem*)it.current();
+                while (*it) {
+                        item = (ConfigItem*)(*it);
                         if (!item->menu)
                                 continue;
                         item->testUpdateMenu(menu_is_visible(item->menu));
+
+                        ++it;
                 }
                 return;
         }
 
         if (rootEntry != &rootmenu && (mode == singleMode ||
             (mode == symbolMode && rootEntry->parent != &rootmenu))) {
-                item = firstChild();
+                item = (ConfigItem *)topLevelItem(0);
                 if (!item)
                         item = new ConfigItem(this, 0, true);
                 last = item;
@@ -479,12 +453,14 @@ void ConfigList::updateList(ConfigItem* item)
                         item->testUpdateMenu(true);
 
                 updateMenuList(item, rootEntry);
-                triggerUpdate();
+                update();
+                resizeColumnToContents(0);
                 return;
         }
 update:
         updateMenuList(this, rootEntry);
-        triggerUpdate();
+        update();
+        resizeColumnToContents(0);
 }
 
 void ConfigList::setValue(ConfigItem* item, tristate val)
@@ -506,7 +482,7 @@ void ConfigList::setValue(ConfigItem* item, tristate val)
                 if (!sym_set_tristate_value(sym, val))
                         return;
                 if (oldval == no && item->menu->list)
-                        item->setOpen(TRUE);
+                        item->setExpanded(true);
                 parent()->updateList(item);
                 break;
         }
@@ -524,7 +500,7 @@ void ConfigList::changeValue(ConfigItem* item)
         sym = menu->sym;
         if (!sym) {
                 if (item->menu->list)
-                        item->setOpen(!item->isOpen());
+                        item->setExpanded(!item->isExpanded());
                 return;
         }
 
@@ -536,9 +512,9 @@ void ConfigList::changeValue(ConfigItem* item)
                 newexpr = sym_toggle_tristate_value(sym);
                 if (item->menu->list) {
                         if (oldexpr == newexpr)
-                                item->setOpen(!item->isOpen());
+                                item->setExpanded(!item->isExpanded());
                         else if (oldexpr == no)
-                                item->setOpen(TRUE);
+                                item->setExpanded(true);
                 }
                 if (oldexpr != newexpr)
                         parent()->updateList(item);
@@ -546,10 +522,7 @@ void ConfigList::changeValue(ConfigItem* item)
         case S_INT:
         case S_HEX:
         case S_STRING:
-                if (colMap[dataColIdx] >= 0)
-                        item->startRename(colMap[dataColIdx]);
-                else
-                        parent()->lineEdit->show(item);
+                parent()->lineEdit->show(item);
                 break;
         }
 }
@@ -566,8 +539,10 @@ void ConfigList::setRootMenu(struct menu *menu)
         updateMenuList(this, 0);
         rootEntry = menu;
         updateListAll();
-        setSelected(currentItem(), hasFocus());
-        ensureItemVisible(currentItem());
+        if (currentItem()) {
+                currentItem()->setSelected(hasFocus());
+                scrollToItem(currentItem());
+        }
 }
 
 void ConfigList::setParentMenu(void)
@@ -580,13 +555,16 @@ void ConfigList::setParentMenu(void)
                 return;
         setRootMenu(menu_get_parent_menu(rootEntry->parent));
 
-        Q3ListViewItemIterator it(this);
-        for (; (item = (ConfigItem*)it.current()); it++) {
+        QTreeWidgetItemIterator it(this);
+        while (*it) {
+                item = (ConfigItem *)(*it);
                 if (item->menu == oldroot) {
                         setCurrentItem(item);
-                        ensureItemVisible(item);
+                        scrollToItem(item);
                         break;
                 }
+
+                ++it;
         }
 }
 
@@ -597,8 +575,7 @@ void ConfigList::setParentMenu(void)
  * parent: either the menu list widget or a menu entry widget
  * menu: entry to be updated
  */
-template <class P>
-void ConfigList::updateMenuList(P* parent, struct menu* menu)
+void ConfigList::updateMenuList(ConfigItem *parent, struct menu* menu)
 {
         struct menu* child;
         ConfigItem* item;
@@ -607,8 +584,11 @@ void ConfigList::updateMenuList(P* parent, struct menu* menu)
         enum prop_type type;
 
         if (!menu) {
-                while ((item = parent->firstChild()))
-                        delete item;
+                while (parent->childCount() > 0)
+                {
+                        delete parent->takeChild(0);
+                }
+
                 return;
         }
 
@@ -660,9 +640,74 @@ void ConfigList::updateMenuList(P* parent, struct menu* menu)
         }
 }
 
+void ConfigList::updateMenuList(ConfigList *parent, struct menu* menu)
+{
+        struct menu* child;
+        ConfigItem* item;
+        ConfigItem* last;
+        bool visible;
+        enum prop_type type;
+
+        if (!menu) {
+                while (parent->topLevelItemCount() > 0)
+                {
+                        delete parent->takeTopLevelItem(0);
+                }
+
+                return;
+        }
+
+        last = (ConfigItem*)parent->topLevelItem(0);
+        if (last && !last->goParent)
+                last = 0;
+        for (child = menu->list; child; child = child->next) {
+                item = last ? last->nextSibling() : (ConfigItem*)parent->topLevelItem(0);
+                type = child->prompt ? child->prompt->type : P_UNKNOWN;
+
+                switch (mode) {
+                case menuMode:
+                        if (!(child->flags & MENU_ROOT))
+                                goto hide;
+                        break;
+                case symbolMode:
+                        if (child->flags & MENU_ROOT)
+                                goto hide;
+                        break;
+                default:
+                        break;
+                }
+
+                visible = menu_is_visible(child);
+                if (!menuSkip(child)) {
+                        if (!child->sym && !child->list && !child->prompt)
+                                continue;
+                        if (!item || item->menu != child)
+                                item = new ConfigItem(parent, last, child, visible);
+                        else
+                                item->testUpdateMenu(visible);
+
+                        if (mode == fullMode || mode == menuMode || type != P_MENU)
+                                updateMenuList(item, child);
+                        else
+                                updateMenuList(item, 0);
+                        last = item;
+                        continue;
+                }
+        hide:
+                if (item && item->menu == child) {
+                        last = (ConfigItem*)parent->topLevelItem(0);
+                        if (last == item)
+                                last = 0;
+                        else while (last->nextSibling() != item)
+                                last = last->nextSibling();
+                        delete item;
+                }
+        }
+}
+
 void ConfigList::keyPressEvent(QKeyEvent* ev)
 {
-        Q3ListViewItem* i = currentItem();
+        QTreeWidgetItem* i = currentItem();
         ConfigItem* item;
         struct menu *menu;
         enum prop_type type;
@@ -714,20 +759,20 @@ void ConfigList::keyPressEvent(QKeyEvent* ev)
         ev->accept();
 }
 
-void ConfigList::contentsMousePressEvent(QMouseEvent* e)
+void ConfigList::mousePressEvent(QMouseEvent* e)
 {
         //QPoint p(contentsToViewport(e->pos()));
         //printf("contentsMousePressEvent: %d,%d\n", p.x(), p.y());
-        Parent::contentsMousePressEvent(e);
+        Parent::mousePressEvent(e);
 }
 
-void ConfigList::contentsMouseReleaseEvent(QMouseEvent* e)
+void ConfigList::mouseReleaseEvent(QMouseEvent* e)
 {
-        QPoint p(contentsToViewport(e->pos()));
+        QPoint p = e->pos();
         ConfigItem* item = (ConfigItem*)itemAt(p);
         struct menu *menu;
         enum prop_type ptype;
-        const QPixmap* pm;
+        QIcon icon;
         int idx, x;
 
         if (!item)
@@ -735,14 +780,13 @@ void ConfigList::contentsMouseReleaseEvent(QMouseEvent* e)
 
         menu = item->menu;
         x = header()->offset() + p.x();
-        idx = colRevMap[header()->sectionAt(x)];
+        idx = header()->logicalIndexAt(x);
         switch (idx) {
         case promptColIdx:
-                pm = item->pixmap(promptColIdx);
-                if (pm) {
-                        int off = header()->sectionPos(0) + itemMargin() +
-                                treeStepSize() * (item->depth() + (rootIsDecorated() ? 1 : 0));
-                        if (x >= off && x < off + pm->width()) {
+                icon = item->pixmap(promptColIdx);
+                if (!icon.isNull()) {
+                        int off = header()->sectionPosition(0) + visualRect(indexAt(p)).x() + 4; // 4 is Hardcoded image offset. There might be a way to do it properly.
+                        if (x >= off && x < off + icon.availableSizes().first().width()) {
                                 if (item->goParent) {
                                         emit parentSelected();
                                         break;
@@ -773,19 +817,19 @@ void ConfigList::contentsMouseReleaseEvent(QMouseEvent* e)
 
 skip:
         //printf("contentsMouseReleaseEvent: %d,%d\n", p.x(), p.y());
-        Parent::contentsMouseReleaseEvent(e);
+        Parent::mouseReleaseEvent(e);
 }
 
-void ConfigList::contentsMouseMoveEvent(QMouseEvent* e)
+void ConfigList::mouseMoveEvent(QMouseEvent* e)
 {
         //QPoint p(contentsToViewport(e->pos()));
         //printf("contentsMouseMoveEvent: %d,%d\n", p.x(), p.y());
-        Parent::contentsMouseMoveEvent(e);
+        Parent::mouseMoveEvent(e);
 }
 
-void ConfigList::contentsMouseDoubleClickEvent(QMouseEvent* e)
+void ConfigList::mouseDoubleClickEvent(QMouseEvent* e)
 {
-        QPoint p(contentsToViewport(e->pos()));
+        QPoint p = e->pos(); // TODO: Check if this works(was contentsToViewport).
         ConfigItem* item = (ConfigItem*)itemAt(p);
         struct menu *menu;
         enum prop_type ptype;
@@ -807,7 +851,7 @@ void ConfigList::contentsMouseDoubleClickEvent(QMouseEvent* e)
 
 skip:
         //printf("contentsMouseDoubleClickEvent: %d,%d\n", p.x(), p.y());
-        Parent::contentsMouseDoubleClickEvent(e);
+        Parent::mouseDoubleClickEvent(e);
 }
 
 void ConfigList::focusInEvent(QFocusEvent *e)
@@ -818,7 +862,7 @@ void ConfigList::focusInEvent(QFocusEvent *e)
 
         ConfigItem* item = (ConfigItem *)currentItem();
         if (item) {
-                setSelected(item, TRUE);
+                item->setSelected(true);
                 menu = item->menu;
         }
         emit gotFocus(menu);
@@ -828,33 +872,33 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
 {
         if (e->y() <= header()->geometry().bottom()) {
                 if (!headerPopup) {
-                        Q3Action *action;
+                        QAction *action;
 
-                        headerPopup = new Q3PopupMenu(this);
-                        action = new Q3Action(NULL, _("Show Name"), 0, this);
-                          action->setToggleAction(TRUE);
+                        headerPopup = new QMenu(this);
+                        action = new QAction(_("Show Name"), this);
+                          action->setCheckable(true);
                           connect(action, SIGNAL(toggled(bool)),
                                   parent(), SLOT(setShowName(bool)));
                           connect(parent(), SIGNAL(showNameChanged(bool)),
                                   action, SLOT(setOn(bool)));
-                          action->setOn(showName);
-                          action->addTo(headerPopup);
-                        action = new Q3Action(NULL, _("Show Range"), 0, this);
-                          action->setToggleAction(TRUE);
+                          action->setChecked(showName);
+                          headerPopup->addAction(action);
+                        action = new QAction(_("Show Range"), this);
+                          action->setCheckable(true);
                           connect(action, SIGNAL(toggled(bool)),
                                   parent(), SLOT(setShowRange(bool)));
                           connect(parent(), SIGNAL(showRangeChanged(bool)),
                                   action, SLOT(setOn(bool)));
-                          action->setOn(showRange);
-                          action->addTo(headerPopup);
-                        action = new Q3Action(NULL, _("Show Data"), 0, this);
-                          action->setToggleAction(TRUE);
+                          action->setChecked(showRange);
+                          headerPopup->addAction(action);
+                        action = new QAction(_("Show Data"), this);
+                          action->setCheckable(true);
                           connect(action, SIGNAL(toggled(bool)),
                                   parent(), SLOT(setShowData(bool)));
                           connect(parent(), SIGNAL(showDataChanged(bool)),
                                   action, SLOT(setOn(bool)));
-                          action->setOn(showData);
-                          action->addTo(headerPopup);
+                          action->setChecked(showData);
+                          headerPopup->addAction(action);
                 }
                 headerPopup->exec(e->globalPos());
                 e->accept();
@@ -868,11 +912,17 @@ QAction *ConfigView::showAllAction;
 QAction *ConfigView::showPromptAction;
 
 ConfigView::ConfigView(QWidget* parent, const char *name)
-        : Parent(parent, name)
+        : Parent(parent)
 {
-        list = new ConfigList(this, name);
+        setObjectName(name);
+        QVBoxLayout *verticalLayout = new QVBoxLayout(this);
+        verticalLayout->setContentsMargins(0, 0, 0, 0);
+
+        list = new ConfigList(this);
+        verticalLayout->addWidget(list);
         lineEdit = new ConfigLineEdit(this);
         lineEdit->hide();
+        verticalLayout->addWidget(lineEdit);
 
         this->nextView = viewList;
         viewList = this;
@@ -931,10 +981,13 @@ void ConfigView::setShowData(bool b)
 
 void ConfigList::setAllOpen(bool open)
 {
-        Q3ListViewItemIterator it(this);
+        QTreeWidgetItemIterator it(this);
+
+        while (*it) {
+                (*it)->setExpanded(open);
 
-        for (; it.current(); it++)
-                it.current()->setOpen(open);
+                ++it;
+        }
 }
 
 void ConfigView::updateList(ConfigItem* item)
@@ -954,11 +1007,14 @@ void ConfigView::updateListAll(void)
 }
 
 ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name)
-        : Parent(parent, name), sym(0), _menu(0)
+        : Parent(parent), sym(0), _menu(0)
 {
-        if (name) {
-                configSettings->beginGroup(name);
-                _showDebug = configSettings->readBoolEntry("/showDebug", false);
+        setObjectName(name);
+
+
+        if (!objectName().isEmpty()) {
+                configSettings->beginGroup(objectName());
+                _showDebug = configSettings->value("/showDebug", false).toBool();
                 configSettings->endGroup();
                 connect(configApp, SIGNAL(aboutToQuit()), SLOT(saveSettings()));
         }
@@ -966,9 +1022,9 @@ ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name)
 
 void ConfigInfoView::saveSettings(void)
 {
-        if (name()) {
-                configSettings->beginGroup(name());
-                configSettings->writeEntry("/showDebug", showDebug());
+        if (!objectName().isEmpty()) {
+                configSettings->beginGroup(objectName());
+                configSettings->setValue("/showDebug", showDebug());
                 configSettings->endGroup();
         }
 }
@@ -1127,8 +1183,8 @@ QString ConfigInfoView::print_filter(const QString &str)
 {
         QRegExp re("[<>&\"\\n]");
         QString res = str;
-        for (int i = 0; (i = res.find(re, i)) >= 0;) {
-                switch (res[i].latin1()) {
+        for (int i = 0; (i = res.indexOf(re, i)) >= 0;) {
+                switch (res[i].toLatin1()) {
                 case '<':
                         res.replace(i, 1, "&lt;");
                         i += 4;
@@ -1167,37 +1223,42 @@ void ConfigInfoView::expr_print_help(void *data, struct symbol *sym, const char
                 *text += str2;
 }
 
-Q3PopupMenu* ConfigInfoView::createPopupMenu(const QPoint& pos)
+QMenu* ConfigInfoView::createStandardContextMenu(const QPoint & pos)
 {
-        Q3PopupMenu* popup = Parent::createPopupMenu(pos);
-        Q3Action* action = new Q3Action(NULL, _("Show Debug Info"), 0, popup);
-          action->setToggleAction(TRUE);
+        QMenu* popup = Parent::createStandardContextMenu(pos);
+        QAction* action = new QAction(_("Show Debug Info"), popup);
+          action->setCheckable(true);
           connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool)));
           connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setOn(bool)));
-          action->setOn(showDebug());
-        popup->insertSeparator();
-        action->addTo(popup);
+          action->setChecked(showDebug());
+        popup->addSeparator();
+        popup->addAction(action);
         return popup;
 }
 
-void ConfigInfoView::contentsContextMenuEvent(QContextMenuEvent *e)
+void ConfigInfoView::contextMenuEvent(QContextMenuEvent *e)
 {
-        Parent::contentsContextMenuEvent(e);
+        Parent::contextMenuEvent(e);
 }
 
 ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char *name)
-        : Parent(parent, name), result(NULL)
+        : Parent(parent), result(NULL)
 {
-        setCaption("Search Config");
+        setObjectName(name);
+        setWindowTitle("Search Config");
 
-        QVBoxLayout* layout1 = new QVBoxLayout(this, 11, 6);
-        QHBoxLayout* layout2 = new QHBoxLayout(0, 0, 6);
+        QVBoxLayout* layout1 = new QVBoxLayout(this);
+        layout1->setContentsMargins(11, 11, 11, 11);
+        layout1->setSpacing(6);
+        QHBoxLayout* layout2 = new QHBoxLayout(0);
+        layout2->setContentsMargins(0, 0, 0, 0);
+        layout2->setSpacing(6);
         layout2->addWidget(new QLabel(_("Find:"), this));
         editField = new QLineEdit(this);
         connect(editField, SIGNAL(returnPressed()), SLOT(search()));
         layout2->addWidget(editField);
         searchButton = new QPushButton(_("Search"), this);
-        searchButton->setAutoDefault(FALSE);
+        searchButton->setAutoDefault(false);
         connect(searchButton, SIGNAL(clicked()), SLOT(search()));
         layout2->addWidget(searchButton);
         layout1->addLayout(layout2);
@@ -1215,19 +1276,19 @@ ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char *nam
         layout1->addWidget(split);
 
         if (name) {
-                int x, y, width, height;
+                QVariant x, y;
+                int width, height;
                 bool ok;
 
                 configSettings->beginGroup(name);
-                width = configSettings->readNumEntry("/window width", parent->width() / 2);
-                height = configSettings->readNumEntry("/window height", parent->height() / 2);
+                width = configSettings->value("/window width", parent->width() / 2).toInt();
+                height = configSettings->value("/window height", parent->height() / 2).toInt();
                 resize(width, height);
-                x = configSettings->readNumEntry("/window x", 0, &ok);
-                if (ok)
-                        y = configSettings->readNumEntry("/window y", 0, &ok);
-                if (ok)
-                        move(x, y);
-                Q3ValueList<int> sizes = configSettings->readSizes("/split", &ok);
+                x = configSettings->value("/window x");
+                y = configSettings->value("/window y");
+                if ((x.isValid())&&(y.isValid()))
+                        move(x.toInt(), y.toInt());
+                QList<int> sizes = configSettings->readSizes("/split", &ok);
                 if (ok)
                         split->setSizes(sizes);
                 configSettings->endGroup();
@@ -1237,12 +1298,12 @@ ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char *nam
 
 void ConfigSearchWindow::saveSettings(void)
 {
-        if (name()) {
-                configSettings->beginGroup(name());
-                configSettings->writeEntry("/window x", pos().x());
-                configSettings->writeEntry("/window y", pos().y());
-                configSettings->writeEntry("/window width", size().width());
-                configSettings->writeEntry("/window height", size().height());
+        if (!objectName().isEmpty()) {
+                configSettings->beginGroup(objectName());
+                configSettings->setValue("/window x", pos().x());
+                configSettings->setValue("/window y", pos().y());
+                configSettings->setValue("/window width", size().width());
+                configSettings->setValue("/window height", size().height());
                 configSettings->writeSizes("/split", split->sizes());
                 configSettings->endGroup();
         }
@@ -1258,7 +1319,7 @@ void ConfigSearchWindow::search(void)
         list->list->clear();
         info->clear();
 
-        result = sym_re_search(editField->text().latin1());
+        result = sym_re_search(editField->text().toLatin1());
         if (!result)
                 return;
         for (p = result; *p; p++) {
@@ -1275,29 +1336,25 @@ ConfigMainWindow::ConfigMainWindow(void)
         : searchWindow(0)
 {
         QMenuBar* menu;
-        bool ok;
-        int x, y, width, height;
+        bool ok = true;
+        QVariant x, y;
+        int width, height;
         char title[256];
 
         QDesktopWidget *d = configApp->desktop();
         snprintf(title, sizeof(title), "%s%s",
                 rootmenu.prompt->text,
-#if QT_VERSION < 0x040000
-                " (Qt3)"
-#else
                 ""
-#endif
                 );
-        setCaption(title);
+        setWindowTitle(title);
 
-        width = configSettings->readNumEntry("/window width", d->width() - 64);
-        height = configSettings->readNumEntry("/window height", d->height() - 64);
+        width = configSettings->value("/window width", d->width() - 64).toInt();
+        height = configSettings->value("/window height", d->height() - 64).toInt();
         resize(width, height);
-        x = configSettings->readNumEntry("/window x", 0, &ok);
-        if (ok)
-                y = configSettings->readNumEntry("/window y", 0, &ok);
-        if (ok)
-                move(x, y);
+        x = configSettings->value("/window x");
+        y = configSettings->value("/window y");
+        if ((x.isValid())&&(y.isValid()))
+                move(x.toInt(), y.toInt());
 
         split1 = new QSplitter(this);
         split1->setOrientation(Qt::Horizontal);
@@ -1314,127 +1371,115 @@ ConfigMainWindow::ConfigMainWindow(void)
         configList = configView->list;
 
         helpText = new ConfigInfoView(split2, "help");
-        helpText->setTextFormat(Qt::RichText);
 
         setTabOrder(configList, helpText);
         configList->setFocus();
 
         menu = menuBar();
-        toolBar = new Q3ToolBar("Tools", this);
-
-        backAction = new Q3Action("Back", QPixmap(xpm_back), _("Back"), 0, this);
-          connect(backAction, SIGNAL(activated()), SLOT(goBack()));
-          backAction->setEnabled(FALSE);
-        Q3Action *quitAction = new Q3Action("Quit", _("&Quit"), Qt::CTRL + Qt::Key_Q, this);
-          connect(quitAction, SIGNAL(activated()), SLOT(close()));
-        Q3Action *loadAction = new Q3Action("Load", QPixmap(xpm_load), _("&Load"), Qt::CTRL + Qt::Key_L, this);
-          connect(loadAction, SIGNAL(activated()), SLOT(loadConfig()));
-        saveAction = new Q3Action("Save", QPixmap(xpm_save), _("&Save"), Qt::CTRL + Qt::Key_S, this);
-          connect(saveAction, SIGNAL(activated()), SLOT(saveConfig()));
+        toolBar = new QToolBar("Tools", this);
+        addToolBar(toolBar);
+
+        backAction = new QAction(QPixmap(xpm_back), _("Back"), this);
+          connect(backAction, SIGNAL(triggered(bool)), SLOT(goBack()));
+          backAction->setEnabled(false);
+        QAction *quitAction = new QAction(_("&Quit"), this);
+        quitAction->setShortcut(Qt::CTRL + Qt::Key_Q);
+          connect(quitAction, SIGNAL(triggered(bool)), SLOT(close()));
+        QAction *loadAction = new QAction(QPixmap(xpm_load), _("&Load"), this);
+        loadAction->setShortcut(Qt::CTRL + Qt::Key_L);
+          connect(loadAction, SIGNAL(triggered(bool)), SLOT(loadConfig()));
+        saveAction = new QAction(QPixmap(xpm_save), _("&Save"), this);
+        saveAction->setShortcut(Qt::CTRL + Qt::Key_S);
+          connect(saveAction, SIGNAL(triggered(bool)), SLOT(saveConfig()));
         conf_set_changed_callback(conf_changed);
         // Set saveAction's initial state
         conf_changed();
-        Q3Action *saveAsAction = new Q3Action("Save As...", _("Save &As..."), 0, this);
-          connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs()));
-        Q3Action *searchAction = new Q3Action("Find", _("&Find"), Qt::CTRL + Qt::Key_F, this);
-          connect(searchAction, SIGNAL(activated()), SLOT(searchConfig()));
-        Q3Action *singleViewAction = new Q3Action("Single View", QPixmap(xpm_single_view), _("Single View"), 0, this);
-          connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView()));
-        Q3Action *splitViewAction = new Q3Action("Split View", QPixmap(xpm_split_view), _("Split View"), 0, this);
-          connect(splitViewAction, SIGNAL(activated()), SLOT(showSplitView()));
-        Q3Action *fullViewAction = new Q3Action("Full View", QPixmap(xpm_tree_view), _("Full View"), 0, this);
-          connect(fullViewAction, SIGNAL(activated()), SLOT(showFullView()));
-
-        Q3Action *showNameAction = new Q3Action(NULL, _("Show Name"), 0, this);
-          showNameAction->setToggleAction(TRUE);
+        QAction *saveAsAction = new QAction(_("Save &As..."), this);
+          connect(saveAsAction, SIGNAL(triggered(bool)), SLOT(saveConfigAs()));
+        QAction *searchAction = new QAction(_("&Find"), this);
+        searchAction->setShortcut(Qt::CTRL + Qt::Key_F);
+          connect(searchAction, SIGNAL(triggered(bool)), SLOT(searchConfig()));
+        singleViewAction = new QAction(QPixmap(xpm_single_view), _("Single View"), this);
+        singleViewAction->setCheckable(true);
+          connect(singleViewAction, SIGNAL(triggered(bool)), SLOT(showSingleView()));
+        splitViewAction = new QAction(QPixmap(xpm_split_view), _("Split View"), this);
+        splitViewAction->setCheckable(true);
+          connect(splitViewAction, SIGNAL(triggered(bool)), SLOT(showSplitView()));
+        fullViewAction = new QAction(QPixmap(xpm_tree_view), _("Full View"), this);
+        fullViewAction->setCheckable(true);
+          connect(fullViewAction, SIGNAL(triggered(bool)), SLOT(showFullView()));
+
+        QAction *showNameAction = new QAction(_("Show Name"), this);
+          showNameAction->setCheckable(true);
           connect(showNameAction, SIGNAL(toggled(bool)), configView, SLOT(setShowName(bool)));
-          connect(configView, SIGNAL(showNameChanged(bool)), showNameAction, SLOT(setOn(bool)));
-          showNameAction->setOn(configView->showName());
-        Q3Action *showRangeAction = new Q3Action(NULL, _("Show Range"), 0, this);
-          showRangeAction->setToggleAction(TRUE);
+          showNameAction->setChecked(configView->showName());
+        QAction *showRangeAction = new QAction(_("Show Range"), this);
+          showRangeAction->setCheckable(true);
           connect(showRangeAction, SIGNAL(toggled(bool)), configView, SLOT(setShowRange(bool)));
-          connect(configView, SIGNAL(showRangeChanged(bool)), showRangeAction, SLOT(setOn(bool)));
-          showRangeAction->setOn(configList->showRange);
-        Q3Action *showDataAction = new Q3Action(NULL, _("Show Data"), 0, this);
-          showDataAction->setToggleAction(TRUE);
+        QAction *showDataAction = new QAction(_("Show Data"), this);
+          showDataAction->setCheckable(true);
           connect(showDataAction, SIGNAL(toggled(bool)), configView, SLOT(setShowData(bool)));
-          connect(configView, SIGNAL(showDataChanged(bool)), showDataAction, SLOT(setOn(bool)));
-          showDataAction->setOn(configList->showData);
 
         QActionGroup *optGroup = new QActionGroup(this);
-        optGroup->setExclusive(TRUE);
-        connect(optGroup, SIGNAL(selected(QAction *)), configView,
+        optGroup->setExclusive(true);
+        connect(optGroup, SIGNAL(triggered(QAction*)), configView,
                 SLOT(setOptionMode(QAction *)));
-        connect(optGroup, SIGNAL(selected(QAction *)), menuView,
+        connect(optGroup, SIGNAL(triggered(QAction *)), menuView,
                 SLOT(setOptionMode(QAction *)));
 
-#if QT_VERSION >= 0x040000
         configView->showNormalAction = new QAction(_("Show Normal Options"), optGroup);
         configView->showAllAction = new QAction(_("Show All Options"), optGroup);
         configView->showPromptAction = new QAction(_("Show Prompt Options"), optGroup);
-#else
-        configView->showNormalAction = new QAction(_("Show Normal Options"), 0, optGroup);
-        configView->showAllAction = new QAction(_("Show All Options"), 0, optGroup);
-        configView->showPromptAction = new QAction(_("Show Prompt Options"), 0, optGroup);
-#endif
-        configView->showNormalAction->setToggleAction(TRUE);
-        configView->showNormalAction->setOn(configList->optMode == normalOpt);
-        configView->showAllAction->setToggleAction(TRUE);
-        configView->showAllAction->setOn(configList->optMode == allOpt);
-        configView->showPromptAction->setToggleAction(TRUE);
-        configView->showPromptAction->setOn(configList->optMode == promptOpt);
-
-        Q3Action *showDebugAction = new Q3Action(NULL, _("Show Debug Info"), 0, this);
-          showDebugAction->setToggleAction(TRUE);
+        configView->showNormalAction->setCheckable(true);
+        configView->showAllAction->setCheckable(true);
+        configView->showPromptAction->setCheckable(true);
+
+        QAction *showDebugAction = new QAction( _("Show Debug Info"), this);
+          showDebugAction->setCheckable(true);
           connect(showDebugAction, SIGNAL(toggled(bool)), helpText, SLOT(setShowDebug(bool)));
-          connect(helpText, SIGNAL(showDebugChanged(bool)), showDebugAction, SLOT(setOn(bool)));
-          showDebugAction->setOn(helpText->showDebug());
+          showDebugAction->setChecked(helpText->showDebug());
 
-        Q3Action *showIntroAction = new Q3Action(NULL, _("Introduction"), 0, this);
-          connect(showIntroAction, SIGNAL(activated()), SLOT(showIntro()));
-        Q3Action *showAboutAction = new Q3Action(NULL, _("About"), 0, this);
-          connect(showAboutAction, SIGNAL(activated()), SLOT(showAbout()));
+        QAction *showIntroAction = new QAction( _("Introduction"), this);
+          connect(showIntroAction, SIGNAL(triggered(bool)), SLOT(showIntro()));
+        QAction *showAboutAction = new QAction( _("About"), this);
+          connect(showAboutAction, SIGNAL(triggered(bool)), SLOT(showAbout()));
 
         // init tool bar
-        backAction->addTo(toolBar);
+        toolBar->addAction(backAction);
         toolBar->addSeparator();
-        loadAction->addTo(toolBar);
-        saveAction->addTo(toolBar);
+        toolBar->addAction(loadAction);
+        toolBar->addAction(saveAction);
         toolBar->addSeparator();
-        singleViewAction->addTo(toolBar);
-        splitViewAction->addTo(toolBar);
-        fullViewAction->addTo(toolBar);
+        toolBar->addAction(singleViewAction);
+        toolBar->addAction(splitViewAction);
+        toolBar->addAction(fullViewAction);
 
         // create config menu
-        Q3PopupMenu* config = new Q3PopupMenu(this);
-        menu->insertItem(_("&File"), config);
-        loadAction->addTo(config);
-        saveAction->addTo(config);
-        saveAsAction->addTo(config);
-        config->insertSeparator();
-        quitAction->addTo(config);
+        QMenu* config = menu->addMenu(_("&File"));
+        config->addAction(loadAction);
+        config->addAction(saveAction);
+        config->addAction(saveAsAction);
+        config->addSeparator();
+        config->addAction(quitAction);
 
         // create edit menu
-        Q3PopupMenu* editMenu = new Q3PopupMenu(this);
-        menu->insertItem(_("&Edit"), editMenu);
-        searchAction->addTo(editMenu);
+        QMenu* editMenu = menu->addMenu(_("&Edit"));
+        editMenu->addAction(searchAction);
 
         // create options menu
-        Q3PopupMenu* optionMenu = new Q3PopupMenu(this);
-        menu->insertItem(_("&Option"), optionMenu);
-        showNameAction->addTo(optionMenu);
-        showRangeAction->addTo(optionMenu);
-        showDataAction->addTo(optionMenu);
-        optionMenu->insertSeparator();
-        optGroup->addTo(optionMenu);
-        optionMenu->insertSeparator();
+        QMenu* optionMenu = menu->addMenu(_("&Option"));
+        optionMenu->addAction(showNameAction);
+        optionMenu->addAction(showRangeAction);
+        optionMenu->addAction(showDataAction);
+        optionMenu->addSeparator();
+        optionMenu->addActions(optGroup->actions());
+        optionMenu->addSeparator();
 
         // create help menu
-        Q3PopupMenu* helpMenu = new Q3PopupMenu(this);
-        menu->insertSeparator();
-        menu->insertItem(_("&Help"), helpMenu);
-        showIntroAction->addTo(helpMenu);
-        showAboutAction->addTo(helpMenu);
+        menu->addSeparator();
+        QMenu* helpMenu = menu->addMenu(_("&Help"));
+        helpMenu->addAction(showIntroAction);
+        helpMenu->addAction(showAboutAction);
 
         connect(configList, SIGNAL(menuChanged(struct menu *)),
                 helpText, SLOT(setInfo(struct menu *)));
@@ -1456,7 +1501,7 @@ ConfigMainWindow::ConfigMainWindow(void)
         connect(helpText, SIGNAL(menuSelected(struct menu *)),
                 SLOT(setMenuLink(struct menu *)));
 
-        QString listMode = configSettings->readEntry("/listMode", "symbol");
+        QString listMode = configSettings->value("/listMode", "symbol").toString();
         if (listMode == "single")
                 showSingleView();
         else if (listMode == "full")
@@ -1465,7 +1510,7 @@ ConfigMainWindow::ConfigMainWindow(void)
                 showSplitView();
 
         // UI setup done, restore splitter positions
-        Q3ValueList<int> sizes = configSettings->readSizes("/split1", &ok);
+        QList<int> sizes = configSettings->readSizes("/split1", &ok);
         if (ok)
                 split1->setSizes(sizes);
 
@@ -1476,7 +1521,7 @@ ConfigMainWindow::ConfigMainWindow(void)
 
 void ConfigMainWindow::loadConfig(void)
 {
-        QString s = Q3FileDialog::getOpenFileName(conf_get_configname(), NULL, this);
+        QString s = QFileDialog::getOpenFileName(this, "", conf_get_configname());
         if (s.isNull())
                 return;
         if (conf_read(QFile::encodeName(s)))
@@ -1495,7 +1540,7 @@ bool ConfigMainWindow::saveConfig(void)
 
 void ConfigMainWindow::saveConfigAs(void)
 {
-        QString s = Q3FileDialog::getSaveFileName(conf_get_configname(), NULL, this);
+        QString s = QFileDialog::getSaveFileName(this, "", conf_get_configname());
         if (s.isNull())
                 return;
         saveConfig();
@@ -1512,9 +1557,9 @@ void ConfigMainWindow::changeMenu(struct menu *menu)
 {
         configList->setRootMenu(menu);
         if (configList->rootEntry->parent == &rootmenu)
-                backAction->setEnabled(FALSE);
+                backAction->setEnabled(false);
         else
-                backAction->setEnabled(TRUE);
+                backAction->setEnabled(true);
 }
 
 void ConfigMainWindow::setMenuLink(struct menu *menu)
@@ -1546,8 +1591,8 @@ void ConfigMainWindow::setMenuLink(struct menu *menu)
                                 return;
                         item = menuList->findConfigItem(parent);
                         if (item) {
-                                menuList->setSelected(item, TRUE);
-                                menuList->ensureItemVisible(item);
+                                item->setSelected(true);
+                                menuList->scrollToItem(item);
                         }
                         list->setRootMenu(parent);
                 }
@@ -1562,8 +1607,8 @@ void ConfigMainWindow::setMenuLink(struct menu *menu)
         if (list) {
                 item = list->findConfigItem(menu);
                 if (item) {
-                        list->setSelected(item, TRUE);
-                        list->ensureItemVisible(item);
+                        item->setSelected(true);
+                        list->scrollToItem(item);
                         list->setFocus();
                 }
         }
@@ -1577,15 +1622,21 @@ void ConfigMainWindow::listFocusChanged(void)
 
 void ConfigMainWindow::goBack(void)
 {
-        ConfigItem* item;
+        ConfigItem* item, *oldSelection;
 
         configList->setParentMenu();
         if (configList->rootEntry == &rootmenu)
-                backAction->setEnabled(FALSE);
-        item = (ConfigItem*)menuList->selectedItem();
+                backAction->setEnabled(false);
+
+        if (menuList->selectedItems().count() == 0)
+                return;
+
+        item = (ConfigItem*)menuList->selectedItems().first();
+        oldSelection = item;
         while (item) {
                 if (item->menu == configList->rootEntry) {
-                        menuList->setSelected(item, TRUE);
+                        oldSelection->setSelected(false);
+                        item->setSelected(true);
                         break;
                 }
                 item = (ConfigItem*)item->parent();
@@ -1594,6 +1645,13 @@ void ConfigMainWindow::goBack(void)
 
 void ConfigMainWindow::showSingleView(void)
 {
+        singleViewAction->setEnabled(false);
+        singleViewAction->setChecked(true);
+        splitViewAction->setEnabled(true);
+        splitViewAction->setChecked(false);
+        fullViewAction->setEnabled(true);
+        fullViewAction->setChecked(false);
+
         menuView->hide();
         menuList->setRootMenu(0);
         configList->mode = singleMode;
@@ -1601,28 +1659,41 @@ void ConfigMainWindow::showSingleView(void)
                 configList->updateListAll();
         else
                 configList->setRootMenu(&rootmenu);
-        configList->setAllOpen(TRUE);
         configList->setFocus();
 }
 
 void ConfigMainWindow::showSplitView(void)
 {
+        singleViewAction->setEnabled(true);
+        singleViewAction->setChecked(false);
+        splitViewAction->setEnabled(false);
+        splitViewAction->setChecked(true);
+        fullViewAction->setEnabled(true);
+        fullViewAction->setChecked(false);
+
         configList->mode = symbolMode;
         if (configList->rootEntry == &rootmenu)
                 configList->updateListAll();
         else
                 configList->setRootMenu(&rootmenu);
-        configList->setAllOpen(TRUE);
+        configList->setAllOpen(true);
         configApp->processEvents();
         menuList->mode = menuMode;
         menuList->setRootMenu(&rootmenu);
-        menuList->setAllOpen(TRUE);
+        menuList->setAllOpen(true);
         menuView->show();
         menuList->setFocus();
 }
 
 void ConfigMainWindow::showFullView(void)
 {
+        singleViewAction->setEnabled(true);
+        singleViewAction->setChecked(false);
+        splitViewAction->setEnabled(true);
+        splitViewAction->setChecked(false);
+        fullViewAction->setEnabled(false);
+        fullViewAction->setChecked(true);
+
         menuView->hide();
         menuList->setRootMenu(0);
         configList->mode = fullMode;
@@ -1630,7 +1701,6 @@ void ConfigMainWindow::showFullView(void)
                 configList->updateListAll();
         else
                 configList->setRootMenu(&rootmenu);
-        configList->setAllOpen(FALSE);
         configList->setFocus();
 }
 
@@ -1684,7 +1754,8 @@ void ConfigMainWindow::showIntro(void)
 
 void ConfigMainWindow::showAbout(void)
 {
-        static const QString str = _("qconf is Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>.\n\n"
+        static const QString str = _("qconf is Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>.\n"
+                "Copyright (C) 2015 Boris Barbulovski <bbarbulovski@gmail.com>.\n\n"
                 "Bug reports and feature request can also be entered at http://bugzilla.kernel.org/\n");
 
         QMessageBox::information(this, "qconf", str);
@@ -1692,10 +1763,10 @@ void ConfigMainWindow::showAbout(void)
 
 void ConfigMainWindow::saveSettings(void)
 {
-        configSettings->writeEntry("/window x", pos().x());
-        configSettings->writeEntry("/window y", pos().y());
-        configSettings->writeEntry("/window width", size().width());
-        configSettings->writeEntry("/window height", size().height());
+        configSettings->setValue("/window x", pos().x());
+        configSettings->setValue("/window y", pos().y());
+        configSettings->setValue("/window width", size().width());
+        configSettings->setValue("/window height", size().height());
 
         QString entry;
         switch(configList->mode) {
@@ -1714,7 +1785,7 @@ void ConfigMainWindow::saveSettings(void)
         default:
                 break;
         }
-        configSettings->writeEntry("/listMode", entry);
+        configSettings->setValue("/listMode", entry);
 
         configSettings->writeSizes("/split1", split1->sizes());
         configSettings->writeSizes("/split2", split2->sizes());
@@ -1746,7 +1817,7 @@ static const char *progname;
 
 static void usage(void)
 {
-        printf(_("%s [-s] <config>\n"), progname);
+        printf(_("%s [-s] <config>\n").toLatin1().constData(), progname);
         exit(0);
 }
 
@@ -1785,7 +1856,6 @@ int main(int ac, char** av)
         v = new ConfigMainWindow();
 
         //zconfdump(stdout);
-        configApp->setMainWidget(v);
         configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit()));
         configApp->connect(configApp, SIGNAL(aboutToQuit()), v, SLOT(saveSettings()));
         v->show();
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index bde0c6b6f9e8..a40036d1b059 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -3,26 +3,18 @@
  * Released under the terms of the GNU GPL v2.0.
  */
 
-#if QT_VERSION < 0x040000
-#include <qlistview.h>
-#else
-#include <q3listview.h>
-#endif
+#include <QTextBrowser>
+#include <QTreeWidget>
+#include <QMainWindow>
+#include <QHeaderView>
 #include <qsettings.h>
-
-#if QT_VERSION < 0x040000
-#define Q3ValueList             QValueList
-#define Q3PopupMenu             QPopupMenu
-#define Q3ListView              QListView
-#define Q3ListViewItem          QListViewItem
-#define Q3VBox                  QVBox
-#define Q3TextBrowser           QTextBrowser
-#define Q3MainWindow            QMainWindow
-#define Q3Action                QAction
-#define Q3ToolBar               QToolBar
-#define Q3ListViewItemIterator  QListViewItemIterator
-#define Q3FileDialog            QFileDialog
-#endif
+#include <QPushButton>
+#include <QSettings>
+#include <QLineEdit>
+#include <QSplitter>
+#include <QCheckBox>
+#include <QDialog>
+#include "expr.h"
 
 class ConfigView;
 class ConfigList;
@@ -33,8 +25,8 @@ class ConfigMainWindow;
 class ConfigSettings : public QSettings {
 public:
         ConfigSettings();
-        Q3ValueList<int> readSizes(const QString& key, bool *ok);
-        bool writeSizes(const QString& key, const Q3ValueList<int>& value);
+        QList<int> readSizes(const QString& key, bool *ok);
+        bool writeSizes(const QString& key, const QList<int>& value);
 };
 
 enum colIdx {
@@ -47,9 +39,9 @@ enum optionMode {
         normalOpt = 0, allOpt, promptOpt
 };
 
-class ConfigList : public Q3ListView {
+class ConfigList : public QTreeWidget {
         Q_OBJECT
-        typedef class Q3ListView Parent;
+        typedef class QTreeWidget Parent;
 public:
         ConfigList(ConfigView* p, const char *name = 0);
         void reinit(void);
@@ -61,10 +53,10 @@ public:
 
 protected:
         void keyPressEvent(QKeyEvent *e);
-        void contentsMousePressEvent(QMouseEvent *e);
-        void contentsMouseReleaseEvent(QMouseEvent *e);
-        void contentsMouseMoveEvent(QMouseEvent *e);
-        void contentsMouseDoubleClickEvent(QMouseEvent *e);
+        void mousePressEvent(QMouseEvent *e);
+        void mouseReleaseEvent(QMouseEvent *e);
+        void mouseMoveEvent(QMouseEvent *e);
+        void mouseDoubleClickEvent(QMouseEvent *e);
         void focusInEvent(QFocusEvent *e);
         void contextMenuEvent(QContextMenuEvent *e);
 
@@ -95,32 +87,23 @@ public:
         }
         ConfigItem* firstChild() const
         {
-                return (ConfigItem *)Parent::firstChild();
-        }
-        int mapIdx(colIdx idx)
-        {
-                return colMap[idx];
+                return (ConfigItem *)children().first();
         }
-        void addColumn(colIdx idx, const QString& label)
+        void addColumn(colIdx idx)
         {
-                colMap[idx] = Parent::addColumn(label);
-                colRevMap[colMap[idx]] = idx;
+                showColumn(idx);
         }
         void removeColumn(colIdx idx)
         {
-                int col = colMap[idx];
-                if (col >= 0) {
-                        Parent::removeColumn(col);
-                        colRevMap[col] = colMap[idx] = -1;
-                }
+                hideColumn(idx);
         }
         void setAllOpen(bool open);
         void setParentMenu(void);
 
         bool menuSkip(struct menu *);
 
-        template <class P>
-        void updateMenuList(P*, struct menu*);
+        void updateMenuList(ConfigItem *parent, struct menu*);
+        void updateMenuList(ConfigList *parent, struct menu*);
 
         bool updateAll;
 
@@ -132,30 +115,26 @@ public:
         enum listMode mode;
         enum optionMode optMode;
         struct menu *rootEntry;
-        QColorGroup disabledColorGroup;
-        QColorGroup inactivedColorGroup;
-        Q3PopupMenu* headerPopup;
-
-private:
-        int colMap[colNr];
-        int colRevMap[colNr];
+        QPalette disabledColorGroup;
+        QPalette inactivedColorGroup;
+        QMenu* headerPopup;
 };
 
-class ConfigItem : public Q3ListViewItem {
-        typedef class Q3ListViewItem Parent;
+class ConfigItem : public QTreeWidgetItem {
+        typedef class QTreeWidgetItem Parent;
 public:
-        ConfigItem(Q3ListView *parent, ConfigItem *after, struct menu *m, bool v)
-        : Parent(parent, after), menu(m), visible(v), goParent(false)
+        ConfigItem(ConfigList *parent, ConfigItem *after, struct menu *m, bool v)
+        : Parent(parent, after), nextItem(0), menu(m), visible(v), goParent(false)
         {
                 init();
         }
         ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m, bool v)
-        : Parent(parent, after), menu(m), visible(v), goParent(false)
+        : Parent(parent, after), nextItem(0), menu(m), visible(v), goParent(false)
         {
                 init();
         }
-        ConfigItem(Q3ListView *parent, ConfigItem *after, bool v)
-        : Parent(parent, after), menu(0), visible(v), goParent(true)
+        ConfigItem(ConfigList *parent, ConfigItem *after, bool v)
+        : Parent(parent, after), nextItem(0), menu(0), visible(v), goParent(true)
         {
                 init();
         }
@@ -166,33 +145,43 @@ public:
         void testUpdateMenu(bool v);
         ConfigList* listView() const
         {
-                return (ConfigList*)Parent::listView();
+                return (ConfigList*)Parent::treeWidget();
         }
         ConfigItem* firstChild() const
         {
-                return (ConfigItem *)Parent::firstChild();
+                return (ConfigItem *)Parent::child(0);
         }
-        ConfigItem* nextSibling() const
+        ConfigItem* nextSibling()
         {
-                return (ConfigItem *)Parent::nextSibling();
+                ConfigItem *ret = NULL;
+                ConfigItem *_parent = (ConfigItem *)parent();
+
+                if(_parent) {
+                        ret = (ConfigItem *)_parent->child(_parent->indexOfChild(this)+1);
+                } else {
+                        QTreeWidget *_treeWidget = treeWidget();
+                        ret = (ConfigItem *)_treeWidget->topLevelItem(_treeWidget->indexOfTopLevelItem(this)+1);
+                }
+
+                return ret;
         }
         void setText(colIdx idx, const QString& text)
         {
-                Parent::setText(listView()->mapIdx(idx), text);
+                Parent::setText(idx, text);
         }
         QString text(colIdx idx) const
         {
-                return Parent::text(listView()->mapIdx(idx));
+                return Parent::text(idx);
         }
-        void setPixmap(colIdx idx, const QPixmap& pm)
+        void setPixmap(colIdx idx, const QIcon &icon)
         {
-                Parent::setPixmap(listView()->mapIdx(idx), pm);
+                Parent::setIcon(idx, icon);
         }
-        const QPixmap* pixmap(colIdx idx) const
+        const QIcon pixmap(colIdx idx) const
         {
-                return Parent::pixmap(listView()->mapIdx(idx));
+                return icon(idx);
         }
-        void paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align);
+        // TODO: Implement paintCell
 
         ConfigItem* nextItem;
         struct menu *menu;
@@ -216,9 +205,9 @@ public:
         ConfigItem *item;
 };
 
-class ConfigView : public Q3VBox {
+class ConfigView : public QWidget {
         Q_OBJECT
-        typedef class Q3VBox Parent;
+        typedef class QWidget Parent;
 public:
         ConfigView(QWidget* parent, const char *name = 0);
         ~ConfigView(void);
@@ -249,9 +238,9 @@ public:
         static QAction *showPromptAction;
 };
 
-class ConfigInfoView : public Q3TextBrowser {
+class ConfigInfoView : public QTextBrowser {
         Q_OBJECT
-        typedef class Q3TextBrowser Parent;
+        typedef class QTextBrowser Parent;
 public:
         ConfigInfoView(QWidget* parent, const char *name = 0);
         bool showDebug(void) const { return _showDebug; }
@@ -271,8 +260,8 @@ protected:
         QString debug_info(struct symbol *sym);
         static QString print_filter(const QString &str);
         static void expr_print_help(void *data, struct symbol *sym, const char *str);
-        Q3PopupMenu* createPopupMenu(const QPoint& pos);
-        void contentsContextMenuEvent(QContextMenuEvent *e);
+        QMenu *createStandardContextMenu(const QPoint & pos);
+        void contextMenuEvent(QContextMenuEvent *e);
 
         struct symbol *sym;
         struct menu *_menu;
@@ -299,10 +288,10 @@ protected:
         struct symbol **result;
 };
 
-class ConfigMainWindow : public Q3MainWindow {
+class ConfigMainWindow : public QMainWindow {
         Q_OBJECT
 
-        static Q3Action *saveAction;
+        static QAction *saveAction;
         static void conf_changed(void);
 public:
         ConfigMainWindow(void);
@@ -331,8 +320,11 @@ protected:
         ConfigView *configView;
         ConfigList *configList;
         ConfigInfoView *helpText;
-        Q3ToolBar *toolBar;
-        Q3Action *backAction;
-        QSplitter* split1;
-        QSplitter* split2;
+        QToolBar *toolBar;
+        QAction *backAction;
+        QAction *singleViewAction;
+        QAction *splitViewAction;
+        QAction *fullViewAction;
+        QSplitter *split1;
+        QSplitter *split2;
 };
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 50878dc025a5..25cf0c2c0c79 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -1116,6 +1116,8 @@ static void sym_check_print_recursive(struct symbol *last_sym)
                 if (stack->sym == last_sym)
                         fprintf(stderr, "%s:%d:error: recursive dependency detected!\n",
                                 prop->file->name, prop->lineno);
+                        fprintf(stderr, "For a resolution refer to Documentation/kbuild/kconfig-language.txt\n");
+                        fprintf(stderr, "subsection \"Kconfig recursive dependency limitations\"\n");
                 if (stack->expr) {
                         fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n",
                                 prop->file->name, prop->lineno,
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 9a08fb5c1af6..638a38e1b419 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -206,59 +206,73 @@ my $type_env = '(\$\w+)';
 #  One for each output format
 
 # these work fairly well
-my %highlights_html = ( $type_constant, "<i>\$1</i>",
-                        $type_func, "<b>\$1</b>",
-                        $type_struct_xml, "<i>\$1</i>",
-                        $type_env, "<b><i>\$1</i></b>",
-                        $type_param, "<tt><b>\$1</b></tt>" );
+my @highlights_html = (
+                       [$type_constant, "<i>\$1</i>"],
+                       [$type_func, "<b>\$1</b>"],
+                       [$type_struct_xml, "<i>\$1</i>"],
+                       [$type_env, "<b><i>\$1</i></b>"],
+                       [$type_param, "<tt><b>\$1</b></tt>"]
+                      );
 my $local_lt = "\\\\\\\\lt:";
 my $local_gt = "\\\\\\\\gt:";
 my $blankline_html = $local_lt . "p" . $local_gt;       # was "<p>"
 
 # html version 5
-my %highlights_html5 = ( $type_constant, "<span class=\"const\">\$1</span>",
-                        $type_func, "<span class=\"func\">\$1</span>",
-                        $type_struct_xml, "<span class=\"struct\">\$1</span>",
-                        $type_env, "<span class=\"env\">\$1</span>",
-                        $type_param, "<span class=\"param\">\$1</span>" );
+my @highlights_html5 = (
+                        [$type_constant, "<span class=\"const\">\$1</span>"],
+                        [$type_func, "<span class=\"func\">\$1</span>"],
+                        [$type_struct_xml, "<span class=\"struct\">\$1</span>"],
+                        [$type_env, "<span class=\"env\">\$1</span>"],
+                        [$type_param, "<span class=\"param\">\$1</span>]"]
+                       );
 my $blankline_html5 = $local_lt . "br /" . $local_gt;
 
 # XML, docbook format
-my %highlights_xml = ( "([^=])\\\"([^\\\"<]+)\\\"", "\$1<quote>\$2</quote>",
-                        $type_constant, "<constant>\$1</constant>",
-                        $type_func, "<function>\$1</function>",
-                        $type_struct_xml, "<structname>\$1</structname>",
-                        $type_env, "<envar>\$1</envar>",
-                        $type_param, "<parameter>\$1</parameter>" );
+my @highlights_xml = (
+                      ["([^=])\\\"([^\\\"<]+)\\\"", "\$1<quote>\$2</quote>"],
+                      [$type_constant, "<constant>\$1</constant>"],
+                      [$type_struct_xml, "<structname>\$1</structname>"],
+                      [$type_param, "<parameter>\$1</parameter>"],
+                      [$type_func, "<function>\$1</function>"],
+                      [$type_env, "<envar>\$1</envar>"]
+                     );
 my $blankline_xml = $local_lt . "/para" . $local_gt . $local_lt . "para" . $local_gt . "\n";
 
 # gnome, docbook format
-my %highlights_gnome = ( $type_constant, "<replaceable class=\"option\">\$1</replaceable>",
-                         $type_func, "<function>\$1</function>",
-                         $type_struct, "<structname>\$1</structname>",
-                         $type_env, "<envar>\$1</envar>",
-                         $type_param, "<parameter>\$1</parameter>" );
+my @highlights_gnome = (
+                        [$type_constant, "<replaceable class=\"option\">\$1</replaceable>"],
+                        [$type_func, "<function>\$1</function>"],
+                        [$type_struct, "<structname>\$1</structname>"],
+                        [$type_env, "<envar>\$1</envar>"],
+                        [$type_param, "<parameter>\$1</parameter>" ]
+                       );
 my $blankline_gnome = "</para><para>\n";
 
 # these are pretty rough
-my %highlights_man = ( $type_constant, "\$1",
-                       $type_func, "\\\\fB\$1\\\\fP",
-                       $type_struct, "\\\\fI\$1\\\\fP",
-                       $type_param, "\\\\fI\$1\\\\fP" );
+my @highlights_man = (
+                      [$type_constant, "\$1"],
+                      [$type_func, "\\\\fB\$1\\\\fP"],
+                      [$type_struct, "\\\\fI\$1\\\\fP"],
+                      [$type_param, "\\\\fI\$1\\\\fP"]
+                     );
 my $blankline_man = "";
 
 # text-mode
-my %highlights_text = ( $type_constant, "\$1",
-                        $type_func, "\$1",
-                        $type_struct, "\$1",
-                        $type_param, "\$1" );
+my @highlights_text = (
+                       [$type_constant, "\$1"],
+                       [$type_func, "\$1"],
+                       [$type_struct, "\$1"],
+                       [$type_param, "\$1"]
+                      );
 my $blankline_text = "";
 
 # list mode
-my %highlights_list = ( $type_constant, "\$1",
-                        $type_func, "\$1",
-                        $type_struct, "\$1",
-                        $type_param, "\$1" );
+my @highlights_list = (
+                       [$type_constant, "\$1"],
+                       [$type_func, "\$1"],
+                       [$type_struct, "\$1"],
+                       [$type_param, "\$1"]
+                      );
 my $blankline_list = "";
 
 # read arguments
@@ -273,7 +287,7 @@ my $verbose = 0;
 my $output_mode = "man";
 my $output_preformatted = 0;
 my $no_doc_sections = 0;
-my %highlights = %highlights_man;
+my @highlights = @highlights_man;
 my $blankline = $blankline_man;
 my $modulename = "Kernel API";
 my $function_only = 0;
@@ -374,31 +388,31 @@ while ($ARGV[0] =~ m/^-(.*)/) {
     my $cmd = shift @ARGV;
     if ($cmd eq "-html") {
         $output_mode = "html";
-        %highlights = %highlights_html;
+        @highlights = @highlights_html;
         $blankline = $blankline_html;
     } elsif ($cmd eq "-html5") {
         $output_mode = "html5";
-        %highlights = %highlights_html5;
+        @highlights = @highlights_html5;
         $blankline = $blankline_html5;
     } elsif ($cmd eq "-man") {
         $output_mode = "man";
-        %highlights = %highlights_man;
+        @highlights = @highlights_man;
         $blankline = $blankline_man;
     } elsif ($cmd eq "-text") {
         $output_mode = "text";
-        %highlights = %highlights_text;
+        @highlights = @highlights_text;
         $blankline = $blankline_text;
     } elsif ($cmd eq "-docbook") {
         $output_mode = "xml";
-        %highlights = %highlights_xml;
+        @highlights = @highlights_xml;
         $blankline = $blankline_xml;
     } elsif ($cmd eq "-list") {
         $output_mode = "list";
-        %highlights = %highlights_list;
+        @highlights = @highlights_list;
         $blankline = $blankline_list;
     } elsif ($cmd eq "-gnome") {
         $output_mode = "gnome";
-        %highlights = %highlights_gnome;
+        @highlights = @highlights_gnome;
         $blankline = $blankline_gnome;
     } elsif ($cmd eq "-module") { # not needed for XML, inherits from calling document
         $modulename = shift @ARGV;
@@ -1746,7 +1760,7 @@ sub output_declaration {
     my $func = "output_${functype}_$output_mode";
     if (($function_only==0) ||
         ( $function_only == 1 && defined($function_table{$name})) ||
-        ( $function_only == 2 && !defined($function_table{$name})))
+        ( $function_only == 2 && !($functype eq "function" && defined($function_table{$name}))))
     {
         &$func(@_);
         $section_counter++;
@@ -1791,8 +1805,8 @@ sub dump_struct($$) {
         $nested = $1;
 
         # ignore members marked private:
-        $members =~ s/\/\*\s*private:.*?\/\*\s*public:.*?\*\///gos;
-        $members =~ s/\/\*\s*private:.*//gos;
+        $members =~ s/\/\*\s*private:.*?\/\*\s*public:.*?\*\///gosi;
+        $members =~ s/\/\*\s*private:.*//gosi;
         # strip comments:
         $members =~ s/\/\*.*?\*\///gos;
         $nested =~ s/\/\*.*?\*\///gos;
@@ -1869,6 +1883,31 @@ sub dump_typedef($$) {
     my $file = shift;
 
     $x =~ s@/\*.*?\*/@@gos;     # strip comments.
+
+    # Parse function prototypes
+    if ($x =~ /typedef\s+(\w+)\s*\(\*\s*(\w\S+)\s*\)\s*\((.*)\);/) {
+        # Function typedefs
+        $return_type = $1;
+        $declaration_name = $2;
+        my $args = $3;
+
+        create_parameterlist($args, ',', $file);
+
+        output_declaration($declaration_name,
+                           'function',
+                           {'function' => $declaration_name,
+                            'module' => $modulename,
+                            'functiontype' => $return_type,
+                            'parameterlist' => \@parameterlist,
+                            'parameterdescs' => \%parameterdescs,
+                            'parametertypes' => \%parametertypes,
+                            'sectionlist' => \@sectionlist,
+                            'sections' => \%sections,
+                            'purpose' => $declaration_purpose
+                           });
+        return;
+    }
+
     while (($x =~ /\(*.\)\s*;$/) || ($x =~ /\[*.\]\s*;$/)) {
         $x =~ s/\(*.\)\s*;$/;/;
         $x =~ s/\[*.\]\s*;$/;/;
@@ -2391,12 +2430,13 @@ sub process_file($) {
     my $descr;
     my $in_purpose = 0;
     my $initial_section_counter = $section_counter;
+    my ($orig_file) = @_;
 
     if (defined($ENV{'SRCTREE'})) {
-        $file = "$ENV{'SRCTREE'}" . "/" . "@_";
+        $file = "$ENV{'SRCTREE'}" . "/" . $orig_file;
     }
     else {
-        $file = "@_";
+        $file = $orig_file;
     }
     if (defined($source_map{$file})) {
         $file = $source_map{$file};
@@ -2640,7 +2680,7 @@ sub process_file($) {
             print "<refentry>\n";
             print " <refnamediv>\n";
             print "  <refname>\n";
-            print "   ${file}\n";
+            print "   ${orig_file}\n";
             print "  </refname>\n";
             print "  <refpurpose>\n";
             print "   Document generation inconsistency\n";
@@ -2654,7 +2694,7 @@ sub process_file($) {
             print "   <para>\n";
             print "    The template for this document tried to insert\n";
             print "    the structured comment from the file\n";
-            print "    <filename>${file}</filename> at this point,\n";
+            print "    <filename>${orig_file}</filename> at this point,\n";
             print "    but none was found.\n";
             print "    This dummy section is inserted to allow\n";
             print "    generation to continue.\n";
@@ -2671,9 +2711,11 @@ $kernelversion = get_kernel_version();
 
 # generate a sequence of code that will splice in highlighting information
 # using the s// operator.
-foreach my $pattern (sort keys %highlights) {
-#   print STDERR "scanning pattern:$pattern, highlight:($highlights{$pattern})\n";
-    $dohighlight .=  "\$contents =~ s:$pattern:$highlights{$pattern}:gs;\n";
+for (my $k = 0; $k < @highlights; $k++) {
+    my $pattern = $highlights[$k][0];
+    my $result = $highlights[$k][1];
+#   print STDERR "scanning pattern:$pattern, highlight:($result)\n";
+    $dohighlight .=  "\$contents =~ s:$pattern:$result:gs;\n";
 }
 
 # Read the file that maps relative names to absolute names for
diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c
index e70fcd12eeeb..840b97328b39 100644
--- a/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@ -185,6 +185,7 @@ int main(void)
         DEVID(mei_cl_device_id);
         DEVID_FIELD(mei_cl_device_id, name);
         DEVID_FIELD(mei_cl_device_id, uuid);
+        DEVID_FIELD(mei_cl_device_id, version);
 
         DEVID(rio_device_id);
         DEVID_FIELD(rio_device_id, did);
@@ -196,5 +197,10 @@ int main(void)
         DEVID_FIELD(ulpi_device_id, vendor);
         DEVID_FIELD(ulpi_device_id, product);
 
+        DEVID(hda_device_id);
+        DEVID_FIELD(hda_device_id, vendor_id);
+        DEVID_FIELD(hda_device_id, rev_id);
+        DEVID_FIELD(hda_device_id, api_version);
+
         return 0;
 }
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 5f2088209132..5b96206e9aab 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -137,10 +137,12 @@ static inline void add_wildcard(char *str)
 static inline void add_uuid(char *str, uuid_le uuid)
 {
         int len = strlen(str);
-        int i;
 
-        for (i = 0; i < 16; i++)
-                sprintf(str + len + (i << 1), "%02x", uuid.b[i]);
+        sprintf(str + len, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+                uuid.b[3], uuid.b[2], uuid.b[1], uuid.b[0],
+                uuid.b[5], uuid.b[4], uuid.b[7], uuid.b[6],
+                uuid.b[8], uuid.b[9], uuid.b[10], uuid.b[11],
+                uuid.b[12], uuid.b[13], uuid.b[14], uuid.b[15]);
 }
 
 /**
@@ -1200,16 +1202,18 @@ static int do_cpu_entry(const char *filename, void *symval, char *alias)
 }
 ADD_TO_DEVTABLE("cpu", cpu_feature, do_cpu_entry);
 
-/* Looks like: mei:S:uuid */
+/* Looks like: mei:S:uuid:N:* */
 static int do_mei_entry(const char *filename, void *symval,
                         char *alias)
 {
         DEF_FIELD_ADDR(symval, mei_cl_device_id, name);
         DEF_FIELD_ADDR(symval, mei_cl_device_id, uuid);
+        DEF_FIELD(symval, mei_cl_device_id, version);
 
         sprintf(alias, MEI_CL_MODULE_PREFIX);
         sprintf(alias + strlen(alias), "%s:",  (*name)[0]  ? *name : "*");
         add_uuid(alias, *uuid);
+        ADD(alias, ":", version != MEI_CL_VERSION_ANY, version);
 
         strcat(alias, ":*");
 
@@ -1250,6 +1254,23 @@ static int do_ulpi_entry(const char *filename, void *symval,
 }
 ADD_TO_DEVTABLE("ulpi", ulpi_device_id, do_ulpi_entry);
 
+/* Looks like: hdaudio:vNrNaN */
+static int do_hda_entry(const char *filename, void *symval, char *alias)
+{
+        DEF_FIELD(symval, hda_device_id, vendor_id);
+        DEF_FIELD(symval, hda_device_id, rev_id);
+        DEF_FIELD(symval, hda_device_id, api_version);
+
+        strcpy(alias, "hdaudio:");
+        ADD(alias, "v", vendor_id != 0, vendor_id);
+        ADD(alias, "r", rev_id != 0, rev_id);
+        ADD(alias, "a", api_version != 0, api_version);
+
+        add_wildcard(alias);
+        return 1;
+}
+ADD_TO_DEVTABLE("hdaudio", hda_device_id, do_hda_entry);
+
 /* Does namelen bytes of name exactly match the symbol? */
 static bool sym_is(const char *name, unsigned namelen, const char *symbol)
 {
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 12d3db3bd46b..e080746e1a6b 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -38,6 +38,7 @@ static int warn_unresolved = 0;
 /* How a symbol is exported */
 static int sec_mismatch_count = 0;
 static int sec_mismatch_verbose = 1;
+static int sec_mismatch_fatal = 0;
 /* ignore missing files */
 static int ignore_missing_files;
 
@@ -833,6 +834,8 @@ static const char *const section_white_list[] =
         ".xt.lit",         /* xtensa */
         ".arcextmap*",                  /* arc */
         ".gnu.linkonce.arcext*",        /* arc : modules */
+        ".cmem*",                       /* EZchip */
+        ".fmt_slot*",                   /* EZchip */
         ".gnu.lto*",
         NULL
 };
@@ -2133,6 +2136,11 @@ static void add_staging_flag(struct buffer *b, const char *name)
                 buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
 }
 
+/* In kernel, this size is defined in linux/module.h;
+ * here we use Elf_Addr instead of long for covering cross-compile
+ */
+#define MODULE_NAME_LEN (64 - sizeof(Elf_Addr))
+
 /**
  * Record CRCs for unresolved symbols
  **/
@@ -2177,6 +2185,12 @@ static int add_versions(struct buffer *b, struct module *mod)
                                 s->name, mod->name);
                         continue;
                 }
+                if (strlen(s->name) >= MODULE_NAME_LEN) {
+                        merror("too long symbol \"%s\" [%s.ko]\n",
+                               s->name, mod->name);
+                        err = 1;
+                        break;
+                }
                 buf_printf(b, "\t{ %#8x, __VMLINUX_SYMBOL_STR(%s) },\n",
                            s->crc, s->name);
         }
@@ -2374,7 +2388,7 @@ int main(int argc, char **argv)
         struct ext_sym_list *extsym_iter;
         struct ext_sym_list *extsym_start = NULL;
 
-        while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awM:K:")) != -1) {
+        while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awM:K:E")) != -1) {
                 switch (opt) {
                 case 'i':
                         kernel_read = optarg;
@@ -2415,6 +2429,9 @@ int main(int argc, char **argv)
                 case 'w':
                         warn_unresolved = 1;
                         break;
+                case 'E':
+                        sec_mismatch_fatal = 1;
+                        break;
                 default:
                         exit(1);
                 }
@@ -2464,14 +2481,20 @@ int main(int argc, char **argv)
                 sprintf(fname, "%s.mod.c", mod->name);
                 write_if_changed(&buf, fname);
         }
-
         if (dump_write)
                 write_dump(dump_write);
-        if (sec_mismatch_count && !sec_mismatch_verbose)
-                warn("modpost: Found %d section mismatch(es).\n"
-                     "To see full details build your kernel with:\n"
-                     "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
-                     sec_mismatch_count);
+        if (sec_mismatch_count) {
+                if (!sec_mismatch_verbose) {
+                        warn("modpost: Found %d section mismatch(es).\n"
+                             "To see full details build your kernel with:\n"
+                             "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
+                             sec_mismatch_count);
+                }
+                if (sec_mismatch_fatal) {
+                        fatal("modpost: Section mismatches detected.\n"
+                              "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n");
+                }
+        }
 
         return err;
 }
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 0cd46e129920..6c3b038ef40d 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -52,7 +52,16 @@ set_debarch() {
         arm64)
                 debarch=arm64 ;;
         arm*)
-                debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;;
+                if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then
+                    if grep -q CONFIG_VFP=y $KCONFIG_CONFIG; then
+                        debarch=armhf
+                    else
+                        debarch=armel
+                    fi
+                else
+                    debarch=arm
+                fi
+                ;;
         *)
                 debarch=$(dpkg --print-architecture)
                 echo "" >&2
@@ -115,7 +124,7 @@ esac
 BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
 
 # Setup the directory structure
-rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir"
+rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
 mkdir -m 755 -p "$tmpdir/DEBIAN"
 mkdir -p "$tmpdir/lib" "$tmpdir/boot"
 mkdir -p "$fwdir/lib/firmware/$version/"
@@ -408,7 +417,7 @@ binary-arch:
         \$(MAKE) KDEB_SOURCENAME=${sourcename} KDEB_PKGVERSION=${packageversion} bindeb-pkg
 
 clean:
-        rm -rf debian/*tmp
+        rm -rf debian/*tmp debian/files
         mv debian/ debian.backup # debian/ might be cleaned away
         \$(MAKE) clean
         mv debian.backup debian
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index 3d1984e59a30..698768bdc581 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -42,6 +42,7 @@
 
 #ifndef EM_AARCH64
 #define EM_AARCH64      183
+#define R_AARCH64_NONE          0
 #define R_AARCH64_ABS64 257
 #endif
 
@@ -160,6 +161,22 @@ static int make_nop_x86(void *map, size_t const offset)
         return 0;
 }
 
+static unsigned char ideal_nop4_arm64[4] = {0x1f, 0x20, 0x03, 0xd5};
+static int make_nop_arm64(void *map, size_t const offset)
+{
+        uint32_t *ptr;
+
+        ptr = map + offset;
+        /* bl <_mcount> is 0x94000000 before relocation */
+        if (*ptr != 0x94000000)
+                return -1;
+
+        /* Convert to nop */
+        ulseek(fd_map, offset, SEEK_SET);
+        uwrite(fd_map, ideal_nop, 4);
+        return 0;
+}
+
 /*
  * Get the whole file as a programming convenience in order to avoid
  * malloc+lseek+read+free of many pieces.  If successful, then mmap
@@ -345,6 +362,7 @@ do_file(char const *const fname)
                 break;
         case EM_386:
                 reltype = R_386_32;
+                rel_type_nop = R_386_NONE;
                 make_nop = make_nop_x86;
                 ideal_nop = ideal_nop5_x86_32;
                 mcount_adjust_32 = -1;
@@ -353,7 +371,12 @@ do_file(char const *const fname)
                          altmcount = "__gnu_mcount_nc";
                          break;
         case EM_AARCH64:
-                         reltype = R_AARCH64_ABS64; gpfx = '_'; break;
+                        reltype = R_AARCH64_ABS64;
+                        make_nop = make_nop_arm64;
+                        rel_type_nop = R_AARCH64_NONE;
+                        ideal_nop = ideal_nop4_arm64;
+                        gpfx = '_';
+                        break;
         case EM_IA_64:   reltype = R_IA64_IMM64;   gpfx = '_'; break;
         case EM_METAG:   reltype = R_METAG_ADDR32;
                          altmcount = "_mcount_wrapper";
@@ -371,6 +394,7 @@ do_file(char const *const fname)
                 make_nop = make_nop_x86;
                 ideal_nop = ideal_nop5_x86_64;
                 reltype = R_X86_64_64;
+                rel_type_nop = R_X86_64_NONE;
                 mcount_adjust_64 = -1;
                 break;
         }  /* end switch */
diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h
index 49b582a225b0..b9897e2be404 100644
--- a/scripts/recordmcount.h
+++ b/scripts/recordmcount.h
@@ -377,7 +377,7 @@ static void nop_mcount(Elf_Shdr const *const relhdr,
 
                 if (mcountsym == Elf_r_sym(relp) && !is_fake_mcount(relp)) {
                         if (make_nop)
-                                ret = make_nop((void *)ehdr, shdr->sh_offset + relp->r_offset);
+                                ret = make_nop((void *)ehdr, _w(shdr->sh_offset) + _w(relp->r_offset));
                         if (warn_on_notrace_sect && !once) {
                                 printf("Section %s has mcount callers being ignored\n",
                                        txtname);
diff --git a/scripts/sign-file.c b/scripts/sign-file.c
index c3899ca4811c..250a7a645033 100755
--- a/scripts/sign-file.c
+++ b/scripts/sign-file.c
@@ -20,13 +20,34 @@
 #include <getopt.h>
 #include <err.h>
 #include <arpa/inet.h>
+#include <openssl/opensslv.h>
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
-#include <openssl/cms.h>
 #include <openssl/err.h>
 #include <openssl/engine.h>
 
+/*
+ * Use CMS if we have openssl-1.0.0 or newer available - otherwise we have to
+ * assume that it's not available and its header file is missing and that we
+ * should use PKCS#7 instead.  Switching to the older PKCS#7 format restricts
+ * the options we have on specifying the X.509 certificate we want.
+ *
+ * Further, older versions of OpenSSL don't support manually adding signers to
+ * the PKCS#7 message so have to accept that we get a certificate included in
+ * the signature message.  Nor do such older versions of OpenSSL support
+ * signing with anything other than SHA1 - so we're stuck with that if such is
+ * the case.
+ */
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
+#define USE_PKCS7
+#endif
+#ifndef USE_PKCS7
+#include <openssl/cms.h>
+#else
+#include <openssl/pkcs7.h>
+#endif
+
 struct module_signature {
         uint8_t         algo;           /* Public-key crypto algorithm [0] */
         uint8_t         hash;           /* Digest algorithm [0] */
@@ -110,30 +131,42 @@ int main(int argc, char **argv)
         struct module_signature sig_info = { .id_type = PKEY_ID_PKCS7 };
         char *hash_algo = NULL;
         char *private_key_name, *x509_name, *module_name, *dest_name;
-        bool save_cms = false, replace_orig;
+        bool save_sig = false, replace_orig;
         bool sign_only = false;
         unsigned char buf[4096];
-        unsigned long module_size, cms_size;
-        unsigned int use_keyid = 0, use_signed_attrs = CMS_NOATTR;
+        unsigned long module_size, sig_size;
+        unsigned int use_signed_attrs;
         const EVP_MD *digest_algo;
         EVP_PKEY *private_key;
+#ifndef USE_PKCS7
         CMS_ContentInfo *cms;
+        unsigned int use_keyid = 0;
+#else
+        PKCS7 *pkcs7;
+#endif
         X509 *x509;
         BIO *b, *bd = NULL, *bm;
         int opt, n;
-
         OpenSSL_add_all_algorithms();
         ERR_load_crypto_strings();
         ERR_clear_error();
 
         key_pass = getenv("KBUILD_SIGN_PIN");
 
+#ifndef USE_PKCS7
+        use_signed_attrs = CMS_NOATTR;
+#else
+        use_signed_attrs = PKCS7_NOATTR;
+#endif
+
         do {
                 opt = getopt(argc, argv, "dpk");
                 switch (opt) {
-                case 'p': save_cms = true; break;
-                case 'd': sign_only = true; save_cms = true; break;
+                case 'p': save_sig = true; break;
+                case 'd': sign_only = true; save_sig = true; break;
+#ifndef USE_PKCS7
                 case 'k': use_keyid = CMS_USE_KEYID; break;
+#endif
                 case -1: break;
                 default: format();
                 }
@@ -157,6 +190,14 @@ int main(int argc, char **argv)
                 replace_orig = true;
         }
 
+#ifdef USE_PKCS7
+        if (strcmp(hash_algo, "sha1") != 0) {
+                fprintf(stderr, "sign-file: %s only supports SHA1 signing\n",
+                        OPENSSL_VERSION_TEXT);
+                exit(3);
+        }
+#endif
+
         /* Read the private key and the X.509 cert the PKCS#7 message
          * will point to.
          */
@@ -213,7 +254,8 @@ int main(int argc, char **argv)
         bm = BIO_new_file(module_name, "rb");
         ERR(!bm, "%s", module_name);
 
-        /* Load the CMS message from the digest buffer. */
+#ifndef USE_PKCS7
+        /* Load the signature message from the digest buffer. */
         cms = CMS_sign(NULL, NULL, NULL, NULL,
                        CMS_NOCERTS | CMS_PARTIAL | CMS_BINARY | CMS_DETACHED | CMS_STREAM);
         ERR(!cms, "CMS_sign");
@@ -221,17 +263,31 @@ int main(int argc, char **argv)
         ERR(!CMS_add1_signer(cms, x509, private_key, digest_algo,
                              CMS_NOCERTS | CMS_BINARY | CMS_NOSMIMECAP |
                              use_keyid | use_signed_attrs),
-            "CMS_sign_add_signer");
+            "CMS_add1_signer");
         ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) < 0,
             "CMS_final");
 
-        if (save_cms) {
-                char *cms_name;
+#else
+        pkcs7 = PKCS7_sign(x509, private_key, NULL, bm,
+                           PKCS7_NOCERTS | PKCS7_BINARY |
+                           PKCS7_DETACHED | use_signed_attrs);
+        ERR(!pkcs7, "PKCS7_sign");
+#endif
 
-                ERR(asprintf(&cms_name, "%s.p7s", module_name) < 0, "asprintf");
-                b = BIO_new_file(cms_name, "wb");
-                ERR(!b, "%s", cms_name);
-                ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) < 0, "%s", cms_name);
+        if (save_sig) {
+                char *sig_file_name;
+
+                ERR(asprintf(&sig_file_name, "%s.p7s", module_name) < 0,
+                    "asprintf");
+                b = BIO_new_file(sig_file_name, "wb");
+                ERR(!b, "%s", sig_file_name);
+#ifndef USE_PKCS7
+                ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) < 0,
+                    "%s", sig_file_name);
+#else
+                ERR(i2d_PKCS7_bio(b, pkcs7) < 0,
+                        "%s", sig_file_name);
+#endif
                 BIO_free(b);
         }
 
@@ -247,9 +303,13 @@ int main(int argc, char **argv)
         ERR(n < 0, "%s", module_name);
         module_size = BIO_number_written(bd);
 
+#ifndef USE_PKCS7
         ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) < 0, "%s", dest_name);
-        cms_size = BIO_number_written(bd) - module_size;
-        sig_info.sig_len = htonl(cms_size);
+#else
+        ERR(i2d_PKCS7_bio(bd, pkcs7) < 0, "%s", dest_name);
+#endif
+        sig_size = BIO_number_written(bd) - module_size;
+        sig_info.sig_len = htonl(sig_size);
         ERR(BIO_write(bd, &sig_info, sizeof(sig_info)) < 0, "%s", dest_name);
         ERR(BIO_write(bd, magic_number, sizeof(magic_number) - 1) < 0, "%s", dest_name);
 
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 8e5aee6d9da2..262889046703 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -198,6 +198,8 @@ exuberant()
         --regex-c++='/TASK_PFA_TEST\([^,]*,\s*([^)]*)\)/task_\1/'       \
         --regex-c++='/TASK_PFA_SET\([^,]*,\s*([^)]*)\)/task_set_\1/'    \
         --regex-c++='/TASK_PFA_CLEAR\([^,]*,\s*([^)]*)\)/task_clear_\1/'\
+        --regex-c++='/DEF_MMIO_(IN|OUT)_(X|D)\(([^,]*),\s*[^)]*\)/\3/'  \
+        --regex-c++='/DEBUGGER_BOILERPLATE\(([^,]*)\)/\1/'              \
         --regex-c='/PCI_OP_READ\((\w*).*[1-4]\)/pci_bus_read_config_\1/' \
         --regex-c='/PCI_OP_WRITE\((\w*).*[1-4]\)/pci_bus_write_config_\1/' \
         --regex-c='/DEFINE_(MUTEX|SEMAPHORE|SPINLOCK)\((\w*)/\2/v/'     \
diff --git a/scripts/ver_linux b/scripts/ver_linux
index 7de36df4eaa5..024a11ac8b97 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -11,47 +11,95 @@ echo ' '
 uname -a
 echo ' '
 
-gcc -dumpversion 2>&1| awk \
-'NR==1{print "Gnu C                 ", $1}'
-
-make --version 2>&1 | awk -F, '{print $1}' | awk \
-      '/GNU Make/{print "Gnu make              ",$NF}'
-
-echo "binutils               $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')"
-
-echo -n "util-linux             "
-fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$//
-
-echo -n "mount                  "
-mount --version | awk '{print $NF}' | sed -e s/^mount-// -e s/\)$//
-
-depmod -V  2>&1 | awk 'NR==1 {print "module-init-tools     ",$NF}'
-
-tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' |  awk \
-'NR==1 {print "e2fsprogs             ", $2}'
-
-fsck.jfs -V 2>&1 | grep version | sed 's/,//' |  awk \
-'NR==1 {print "jfsutils              ", $3}'
-
-reiserfsck -V 2>&1 | grep ^reiserfsck | awk \
-'NR==1{print "reiserfsprogs         ", $2}'
+gcc -dumpversion 2>&1 |
+awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("GNU C\t\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
+
+make --version 2>&1 |
+awk '/GNU Make/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("GNU Make\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
+
+ld -v 2>&1 |
+awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("Binutils\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
+
+mount --version 2>&1 |
+awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        $0 = substr($0,RSTART,RLENGTH)
+        printf("Util-linux\t\t%s\nMount\t\t\t%s\n",$0,$0)
+}'
+
+depmod -V  2>&1 |
+awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("Module-init-tools\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
+
+tune2fs 2>&1 |
+awk '/^tune2fs/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("E2fsprogs\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
+
+fsck.jfs -V 2>&1 |
+awk '/version/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("Jfsutils\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
+
+reiserfsck -V 2>&1 |
+awk '/^reiserfsck/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("Reiserfsprogs\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
 
 fsck.reiser4 -V 2>&1 | grep ^fsck.reiser4 | awk \
 'NR==1{print "reiser4progs          ", $2}'
 
-xfs_db -V 2>&1 | grep version | awk \
-'NR==1{print "xfsprogs              ", $3}'
+xfs_db -V 2>&1 |
+awk '/version/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("Xfsprogs\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
 
-pccardctl -V 2>&1| grep pcmciautils | awk '{print "pcmciautils           ", $2}'
+pccardctl -V 2>&1 |
+awk '/pcmciautils/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("Pcmciautils\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
 
 cardmgr -V 2>&1| grep version | awk \
 'NR==1{print "pcmcia-cs             ", $3}'
 
-quota -V 2>&1 | grep version | awk \
-'NR==1{print "quota-tools           ", $NF}'
+quota -V 2>&1 |
+awk '/version/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("Quota-tools\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
 
-pppd --version 2>&1| grep version | awk \
-'NR==1{print "PPP                   ", $3}'
+pppd --version 2>&1 |
+awk '/version/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("PPP\t\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
 
 isdnctrl 2>&1 | grep version | awk \
 'NR==1{print "isdn4k-utils          ", $NF}'
@@ -59,40 +107,87 @@ isdnctrl 2>&1 | grep version | awk \
 showmount --version 2>&1 | grep nfs-utils | awk \
 'NR==1{print "nfs-utils             ", $NF}'
 
-echo -n "Linux C Library        "
-sed -n -e '/^.*\/libc-\([^/]*\)\.so$/{s//\1/;p;q}' < /proc/self/maps
-
-ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -n 1 | awk \
-'NR==1{print "Dynamic linker (ldd)  ", $NF}'
-
-ls -l /usr/lib/libg++.so /usr/lib/libstdc++.so  2>/dev/null | awk -F. \
-       '{print "Linux C++ Library      " $4"."$5"."$6}'
-
-ps --version 2>&1 | grep version | awk \
-'NR==1{print "Procps                ", $NF}'
-
-ifconfig --version 2>&1 | grep tools | awk \
-'NR==1{print "Net-tools             ", $NF}'
-
-# Kbd needs 'loadkeys -h',
-loadkeys -h 2>&1 | awk \
-'(NR==1 && ($3 !~ /option/)) {print "Kbd                   ", $3}'
-
-# while console-tools needs 'loadkeys -V'.
-loadkeys -V 2>&1 | awk \
-'(NR==1 && ($2 ~ /console-tools/)) {print "Console-tools         ", $3}'
+test -r /proc/self/maps &&
+sed '
+        /.*libc-\(.*\)\.so$/!d
+        s//Linux C Library\t\t\1/
+        q
+' /proc/self/maps
+
+ldd --version 2>&1 |
+awk '/^ldd/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("Dynamic linker (ldd)\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
+
+libcpp=`ldconfig -p 2>/dev/null |
+        awk '/(libg|stdc)[+]+\.so/ {
+        print $NF
+        exit
+        }
+'`
+test -r "$libcpp" &&
+ls -l $libcpp |
+sed '
+        s!.*so\.!!
+        s!^!Linux C++ Library\t!
+'
+ps --version 2>&1 |
+awk '/version/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("Procps\t\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
+
+ifconfig --version 2>&1 |
+awk '/tools/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("Net-tools\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
+
+loadkeys -V 2>&1 |
+awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        $0 = substr($0,RSTART,RLENGTH)
+        printf("Kbd\t\t\t%s\nConsole-tools\t\t%s\n",$0,$0)
+}'
 
 oprofiled --version 2>&1 | awk \
 '(NR==1 && ($2 == "oprofile")) {print "oprofile              ", $3}'
 
-expr --v 2>&1 | awk 'NR==1{print "Sh-utils              ", $NF}'
-
-udevinfo -V 2>&1 | grep version | awk '{print "udev                  ", $3}'
-
-iwconfig --version 2>&1 | awk \
-'(NR==1 && ($3 == "version")) {print "wireless-tools        ",$4}'
-
-if [ -e /proc/modules ]; then
-    X=`cat /proc/modules | sed -e "s/ .*$//"`
-    echo "Modules Loaded         "$X
-fi
+expr --v 2>&1 |
+awk '/^expr/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("Sh-utils\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
+
+udevadm --version 2>&1 |
+awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("Udev\t\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
+
+iwconfig --version 2>&1 |
+awk '/version/{
+        match($0, /[0-9]+([.]?[0-9]+)+/)
+        printf("Wireless-tools\t\t%s\n",
+        substr($0,RSTART,RLENGTH))
+}'
+
+test -e /proc/modules &&
+sort /proc/modules |
+sed '
+        s/ .*//
+        H
+${
+        g
+        s/^\n/Modules Loaded\t\t/
+        y/\n/ /
+        q
+}
+        d
+'