29 files changed, 285 insertions, 156 deletions

diff --git a/scripts/.gitignore b/scripts/.gitignore
index e2741d23bab8..105b21f08185 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -8,3 +8,4 @@ bin2c
 unifdef
 ihex2fw
 recordmcount
+docproc
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index ed2773edfe71..be39cd1c74cf 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -118,6 +118,11 @@ cc-option-yn = $(call try-run,\
 cc-option-align = $(subst -functions=0,,\
         $(call cc-option,-falign-functions=0,-malign-functions=0))
 
+# cc-disable-warning
+# Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)
+cc-disable-warning = $(call try-run,\
+        $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -xc /dev/null -o "$$TMP",-Wno-$(strip $(1)))
+
 # cc-version
 # Usage gcc-ver := $(call cc-version)
 cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
@@ -141,6 +146,11 @@ cc-ldoption = $(call try-run,\
 ld-option = $(call try-run,\
         $(CC) /dev/null -c -o "$$TMPO" ; $(LD) $(1) "$$TMPO" -o "$$TMP",$(1),$(2))
 
+# ar-option
+# Usage: KBUILD_ARFLAGS := $(call ar-option,D)
+# Important: no spaces around options
+ar-option = $(call try-run, $(AR) rc$(1) "$$TMP",$(1),$(2))
+
 ######
 
 ###
@@ -187,6 +197,8 @@ ifneq ($(KBUILD_NOCMDDEP),1)
 # User may override this check using make KBUILD_NOCMDDEP=1
 arg-check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \
                     $(filter-out $(cmd_$@),   $(cmd_$(1))) )
+else
+arg-check = $(if $(strip $(cmd_$@)),,1)
 endif
 
 # >'< substitution is for echo to work,
diff --git a/scripts/Makefile b/scripts/Makefile
index fcea26168bca..df7678febf27 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -6,6 +6,7 @@
 # pnmttologo:    Convert pnm files to logo files
 # conmakehash:   Create chartable
 # conmakehash:   Create arrays for initializing the kernel console tables
+# docproc:       Used in Documentation/DocBook
 
 hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
 hostprogs-$(CONFIG_LOGO)         += pnmtologo
@@ -16,12 +17,14 @@ hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount
 always          := $(hostprogs-y) $(hostprogs-m)
 
 # The following hostprogs-y programs are only build on demand
-hostprogs-y += unifdef
+hostprogs-y += unifdef docproc
 
-# This target is used internally to avoid "is up to date" messages
+# These targets are used internally to avoid "is up to date" messages
 PHONY += build_unifdef
 build_unifdef: scripts/unifdef FORCE
         @:
+build_docproc: scripts/docproc FORCE
+        @:
 
 subdir-$(CONFIG_MODVERSIONS) += genksyms
 subdir-y                     += mod
diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic
new file mode 100644
index 000000000000..490122c3e2aa
--- /dev/null
+++ b/scripts/Makefile.asm-generic
@@ -0,0 +1,23 @@
+# include/asm-generic contains a lot of files that are used
+# verbatim by several architectures.
+#
+# This Makefile reads the file arch/$(SRCARCH)/include/asm/Kbuild
+# and for each file listed in this file with generic-y creates
+# a small wrapper file in $(obj) (arch/$(SRCARCH)/include/generated/asm)
+
+kbuild-file := $(srctree)/arch/$(SRCARCH)/include/asm/Kbuild
+-include $(kbuild-file)
+
+include scripts/Kbuild.include
+
+# Create output directory if not already present
+_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
+
+quiet_cmd_wrap = WRAP    $@
+cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@
+
+all: $(patsubst %, $(obj)/%, $(generic-y))
+
+$(obj)/%.h:
+        $(call cmd,wrap)
+
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 6165622c3e29..a0fd5029cfe7 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -51,36 +51,52 @@ ifeq ($(KBUILD_NOPEDANTIC),)
 endif
 
 #
-# make W=1 settings
+# make W=... settings
 #
-# $(call cc-option... ) handles gcc -W.. options which
+# W=1 - warnings that may be relevant and does not occur too often
+# W=2 - warnings that occur quite often but may still be relevant
+# W=3 - the more obscure warnings, can most likely be ignored
+#
+# $(call cc-option, -W...) handles gcc -W.. options which
 # are not supported by all versions of the compiler
 ifdef KBUILD_ENABLE_EXTRA_GCC_CHECKS
-KBUILD_EXTRA_WARNINGS := -Wextra
-KBUILD_EXTRA_WARNINGS += -Wunused -Wno-unused-parameter
-KBUILD_EXTRA_WARNINGS += -Waggregate-return
-KBUILD_EXTRA_WARNINGS += -Wbad-function-cast
-KBUILD_EXTRA_WARNINGS += -Wcast-qual
-KBUILD_EXTRA_WARNINGS += -Wcast-align
-KBUILD_EXTRA_WARNINGS += -Wconversion
-KBUILD_EXTRA_WARNINGS += -Wdisabled-optimization
-KBUILD_EXTRA_WARNINGS += -Wlogical-op
-KBUILD_EXTRA_WARNINGS += -Wmissing-declarations
-KBUILD_EXTRA_WARNINGS += -Wmissing-format-attribute
-KBUILD_EXTRA_WARNINGS += $(call cc-option, -Wmissing-include-dirs,)
-KBUILD_EXTRA_WARNINGS += -Wmissing-prototypes
-KBUILD_EXTRA_WARNINGS += -Wnested-externs
-KBUILD_EXTRA_WARNINGS += -Wold-style-definition
-KBUILD_EXTRA_WARNINGS += $(call cc-option, -Woverlength-strings,)
-KBUILD_EXTRA_WARNINGS += -Wpacked
-KBUILD_EXTRA_WARNINGS += -Wpacked-bitfield-compat
-KBUILD_EXTRA_WARNINGS += -Wpadded
-KBUILD_EXTRA_WARNINGS += -Wpointer-arith
-KBUILD_EXTRA_WARNINGS += -Wredundant-decls
-KBUILD_EXTRA_WARNINGS += -Wshadow
-KBUILD_EXTRA_WARNINGS += -Wswitch-default
-KBUILD_EXTRA_WARNINGS += $(call cc-option, -Wvla,)
-KBUILD_CFLAGS += $(KBUILD_EXTRA_WARNINGS)
+warning-  := $(empty)
+
+warning-1 := -Wextra -Wunused -Wno-unused-parameter
+warning-1 += -Wmissing-declarations
+warning-1 += -Wmissing-format-attribute
+warning-1 += -Wmissing-prototypes
+warning-1 += -Wold-style-definition
+warning-1 += $(call cc-option, -Wmissing-include-dirs)
+warning-1 += $(call cc-option, -Wunused-but-set-variable)
+
+warning-2 := -Waggregate-return
+warning-2 += -Wcast-align
+warning-2 += -Wdisabled-optimization
+warning-2 += -Wnested-externs
+warning-2 += -Wshadow
+warning-2 += $(call cc-option, -Wlogical-op)
+
+warning-3 := -Wbad-function-cast
+warning-3 += -Wcast-qual
+warning-3 += -Wconversion
+warning-3 += -Wpacked
+warning-3 += -Wpadded
+warning-3 += -Wpointer-arith
+warning-3 += -Wredundant-decls
+warning-3 += -Wswitch-default
+warning-3 += $(call cc-option, -Wpacked-bitfield-compat)
+warning-3 += $(call cc-option, -Wvla)
+
+warning := $(warning-$(findstring 1, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
+warning += $(warning-$(findstring 2, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
+warning += $(warning-$(findstring 3, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
+
+ifeq ("$(strip $(warning))","")
+        $(error W=$(KBUILD_ENABLE_EXTRA_GCC_CHECKS) is unknown)
+endif
+
+KBUILD_CFLAGS += $(warning)
 endif
 
 include scripts/Makefile.lib
@@ -351,7 +367,7 @@ quiet_cmd_link_o_target = LD      $@
 cmd_link_o_target = $(if $(strip $(obj-y)),\
                       $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^) \
                       $(cmd_secanalysis),\
-                      rm -f $@; $(AR) rcs $@)
+                      rm -f $@; $(AR) rcs$(KBUILD_ARFLAGS) $@)
 
 $(builtin-target): $(obj-y) FORCE
         $(call if_changed,link_o_target)
@@ -377,7 +393,7 @@ $(modorder-target): $(subdir-ym) FORCE
 #
 ifdef lib-target
 quiet_cmd_link_l_target = AR      $@
-cmd_link_l_target = rm -f $@; $(AR) rcs $@ $(lib-y)
+cmd_link_l_target = rm -f $@; $(AR) rcs$(KBUILD_ARFLAGS) $@ $(lib-y)
 
 $(lib-target): $(lib-y) FORCE
         $(call if_changed,link_l_target)
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index f89cb87f5c01..a57f5bd5a13d 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -27,8 +27,13 @@ header-y      := $(filter-out %/, $(header-y))
 install-file  := $(install)/.install
 check-file    := $(install)/.check
 
+# generic-y list all files an architecture uses from asm-generic
+# Use this to build a list of headers which require a wrapper
+wrapper-files := $(filter $(header-y), $(generic-y))
+
 # all headers files for this dir
-all-files     := $(header-y) $(objhdr-y)
+header-y      := $(filter-out $(generic-y), $(header-y))
+all-files     := $(header-y) $(objhdr-y) $(wrapper-files)
 input-files   := $(addprefix $(srctree)/$(obj)/,$(header-y)) \
                  $(addprefix $(objtree)/$(obj)/,$(objhdr-y))
 output-files  := $(addprefix $(install)/, $(all-files))
@@ -47,6 +52,9 @@ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
       cmd_install = \
         $(PERL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(header-y); \
         $(PERL) $< $(objtree)/$(obj) $(install) $(SRCARCH) $(objhdr-y); \
+        for F in $(wrapper-files); do                                   \
+                echo "\#include <asm-generic/$$F>" > $(install)/$$F;    \
+        done;                                                           \
         touch $@
 
 quiet_cmd_remove = REMOVE  $(unwanted)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 1c702ca8aac8..93b2b5938a2e 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -197,7 +197,7 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
 # ---------------------------------------------------------------------------
 
 quiet_cmd_gzip = GZIP    $@
-cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \
+cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
         (rm -f $@ ; false)
 
 # DTC
diff --git a/scripts/basic/.gitignore b/scripts/basic/.gitignore
index bf8b199ec598..a776371a3502 100644
--- a/scripts/basic/.gitignore
+++ b/scripts/basic/.gitignore
@@ -1,3 +1 @@
-hash
 fixdep
-docproc
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile
index 4c324a1f1e0e..4fcef87bb875 100644
--- a/scripts/basic/Makefile
+++ b/scripts/basic/Makefile
@@ -7,9 +7,8 @@
 # .config is included by main Makefile.
 # ---------------------------------------------------------------------------
 # fixdep:        Used to generate dependency information during build process
-# docproc:       Used in Documentation/DocBook
 
-hostprogs-y     := fixdep docproc
+hostprogs-y     := fixdep
 always          := $(hostprogs-y)
 
 # fixdep is needed to compile other host programs
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index d8670810db65..8657f99bfb2b 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -210,10 +210,10 @@ our $typeTypedefs = qr{(?x:
 
 our $logFunctions = qr{(?x:
         printk|
-        pr_(debug|dbg|vdbg|devel|info|warning|err|notice|alert|crit|emerg|cont)|
-        (dev|netdev|netif)_(printk|dbg|vdbg|info|warn|err|notice|alert|crit|emerg|WARN)|
+        [a-z]+_(emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)|
         WARN|
-        panic
+        panic|
+        MODULE_[A-Z_]+
 )};
 
 our @typeList = (
@@ -1462,7 +1462,7 @@ sub process {
 #80 column limit
                 if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ &&
                     $rawline !~ /^.\s*\*\s*\@$Ident\s/ &&
-                    !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:,|\)\s*;)\s*$/ ||
+                    !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:|,|\)\s*;)\s*$/ ||
                     $line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) &&
                     $length > 80)
                 {
@@ -2748,6 +2748,11 @@ sub process {
                         WARN("sizeof(& should be avoided\n" . $herecurr);
                 }
 
+# check for line continuations in quoted strings with odd counts of "
+                if ($rawline =~ /\\$/ && $rawline =~ tr/"/"/ % 2) {
+                        WARN("Avoid line continuations in quoted strings\n" . $herecurr);
+                }
+
 # check for new externs in .c files.
                 if ($realfile =~ /\.c$/ && defined $stat &&
                     $stat =~ /^.\s*(?:extern\s+)?$Type\s+($Ident)(\s*)\(/s)
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index 1afff6658a7d..17e384396705 100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -12,7 +12,7 @@
 #       sh64 port by Paul Mundt
 #       Random bits by Matt Mackall <mpm@selenic.com>
 #       M68k port by Geert Uytterhoeven and Andreas Schwab
-#       AVR32 port by Haavard Skinnemoen <hskinnemoen@atmel.com>
+#       AVR32 port by Haavard Skinnemoen (Atmel)
 #       PARISC port by Kyle McMartin <kyle@parisc-linux.org>
 #       sparc port by Martin Habets <errandir_news@mph.eclipse.co.uk>
 #
diff --git a/scripts/checkversion.pl b/scripts/checkversion.pl
index b444e89a0095..5e490a8ceca5 100755
--- a/scripts/checkversion.pl
+++ b/scripts/checkversion.pl
@@ -12,6 +12,7 @@ $| = 1;
 my $debugging;
 
 foreach my $file (@ARGV) {
+    next if $file =~ "include/linux/version\.h";
     # Open this file.
     open( my $f, '<', $file )
       or die "Can't open $file: $!\n";
diff --git a/scripts/basic/docproc.c b/scripts/docproc.c
index 98dec87974d0..98dec87974d0 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/docproc.c
diff --git a/scripts/export_report.pl b/scripts/export_report.pl
index 04dce7c15f83..8f79b701de87 100644
--- a/scripts/export_report.pl
+++ b/scripts/export_report.pl
@@ -25,11 +25,12 @@ sub alphabetically {
 sub print_depends_on {
         my ($href) = @_;
         print "\n";
-        while (my ($mod, $list) = each %$href) {
+        for my $mod (sort keys %$href) {
+                my $list = $href->{$mod};
                 print "\t$mod:\n";
                 foreach my $sym (sort numerically @{$list}) {
                         my ($symbol, $no) = split /\s+/, $sym;
-                        printf("\t\t%-25s\t%-25d\n", $symbol, $no);
+                        printf("\t\t%-25s\n", $symbol);
                 }
                 print "\n";
         }
@@ -49,8 +50,14 @@ sub usage {
 }
 
 sub collectcfiles {
-    my @file
-        = `cat .tmp_versions/*.mod | grep '.*\.ko\$' | sed s/\.ko$/.mod.c/`;
+    my @file;
+    while (<.tmp_versions/*.mod>) {
+        open my $fh, '<', $_ or die "cannot open $_: $!\n";
+        push (@file,
+              grep s/\.ko/.mod.c/,      # change the suffix
+              grep m/.+\.ko/,           # find the .ko path
+              <$fh>);                   # lines in opened file
+    }
     chomp @file;
     return @file;
 }
@@ -95,6 +102,8 @@ close($module_symvers);
 #
 # collect the usage count of each symbol.
 #
+my $modversion_warnings = 0;
+
 foreach my $thismod (@allcfiles) {
         my $module;
 
@@ -125,7 +134,8 @@ foreach my $thismod (@allcfiles) {
                 }
         }
         if ($state != 2) {
-                print "WARNING:$thismod is not built with CONFIG_MODVERSION enabled\n";
+                warn "WARNING:$thismod is not built with CONFIG_MODVERSIONS enabled\n";
+                $modversion_warnings++;
         }
         close($module);
 }
@@ -159,8 +169,12 @@ printf("SECTION 2:\n\tThis section reports export-symbol-usage of in-kernel
 modules. Each module lists the modules, and the symbols from that module that
 it uses.  Each listed symbol reports the number of modules using it\n");
 
+print "\nNOTE: Got $modversion_warnings CONFIG_MODVERSIONS warnings\n\n"
+    if $modversion_warnings;
+
 print "~"x80 , "\n";
-while (my ($thismod, $list) = each %MODULE) {
+for my $thismod (sort keys %MODULE) {
+        my $list = $MODULE{$thismod};
         my %depends;
         $thismod =~ s/\.mod\.c/.ko/;
         print "\t\t\t$thismod\n";
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
index e12b1a7525cf..b482f162a18a 100644
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Copyright (C) Martin Schlemmer <azarah@nosferatu.za.org>
 # Copyright (C) 2006 Sam Ravnborg <sam@ravnborg.org>
 #
@@ -105,9 +105,9 @@ list_parse() {
 # for links, devices etc the format differs. See gen_init_cpio for details
 parse() {
         local location="$1"
-        local name="${location/${srcdir}//}"
+        local name="/${location#${srcdir}}"
         # change '//' into '/'
-        name="${name//\/\///}"
+        name=$(echo "$name" | sed -e 's://*:/:g')
         local mode="$2"
         local uid="$3"
         local gid="$4"
@@ -117,8 +117,8 @@ parse() {
         [ "$root_gid" = "squash" ] && gid=0 || [ "$gid" -eq "$root_gid" ] && gid=0
         local str="${mode} ${uid} ${gid}"
 
-        [ "${ftype}" == "invalid" ] && return 0
-        [ "${location}" == "${srcdir}" ] && return 0
+        [ "${ftype}" = "invalid" ] && return 0
+        [ "${location}" = "${srcdir}" ] && return 0
 
         case "${ftype}" in
                 "file")
@@ -192,7 +192,7 @@ input_file() {
         if [ -f "$1" ]; then
                 ${dep_list}header "$1"
                 is_cpio="$(echo "$1" | sed 's/^.*\.cpio\(\..*\)\?/cpio/')"
-                if [ $2 -eq 0 -a ${is_cpio} == "cpio" ]; then
+                if [ $2 -eq 0 -a ${is_cpio} = "cpio" ]; then
                         cpio_file=$1
                         echo "$1" | grep -q '^.*\.cpio\..*' && is_cpio_compressed="compressed"
                         [ ! -z ${dep_list} ] && echo "$1"
@@ -204,7 +204,7 @@ input_file() {
                 else
                         echo "$1 \\"
                         cat "$1" | while read type dir file perm ; do
-                                if [ "$type" == "file" ]; then
+                                if [ "$type" = "file" ]; then
                                         echo "$file \\";
                                 fi
                         done
@@ -226,7 +226,7 @@ cpio_list=
 output="/dev/stdout"
 output_file=""
 is_cpio_compressed=
-compr="gzip -9 -f"
+compr="gzip -n -9 -f"
 
 arg="$1"
 case "$arg" in
@@ -240,7 +240,7 @@ case "$arg" in
                 output_file="$1"
                 cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
                 output=${cpio_list}
-                echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
+                echo "$output_file" | grep -q "\.gz$" && compr="gzip -n -9 -f"
                 echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
                 echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
                 echo "$output_file" | grep -q "\.xz$" && \
@@ -287,8 +287,15 @@ done
 # we are careful to delete tmp files
 if [ ! -z ${output_file} ]; then
         if [ -z ${cpio_file} ]; then
+                timestamp=
+                if test -n "$KBUILD_BUILD_TIMESTAMP"; then
+                        timestamp="$(date -d"$KBUILD_BUILD_TIMESTAMP" +%s || :)"
+                        if test -n "$timestamp"; then
+                                timestamp="-t $timestamp"
+                        fi
+                fi
                 cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)"
-                usr/gen_init_cpio ${cpio_list} > ${cpio_tfile}
+                usr/gen_init_cpio $timestamp ${cpio_list} > ${cpio_tfile}
         else
                 cpio_tfile=${cpio_file}
         fi
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 60dd3eb9366e..487ac6f37ca2 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -500,6 +500,8 @@ static void optimize_result(void)
 
                         /* find the token with the breates profit value */
                         best = find_best_token();
+                        if (token_profit[best] == 0)
+                                break;
 
                         /* place it in the "best" table */
                         best_table_len[i] = 2;
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 368ae306aee4..faa9a4701b6f 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -77,14 +77,15 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
 # The symlink is used to repair a deficiency in arch/um
 update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
         $(Q)echo "  GEN config"
-        $(Q)xgettext --default-domain=linux              \
-            --add-comments --keyword=_ --keyword=N_      \
-            --from-code=UTF-8                            \
-            --files-from=scripts/kconfig/POTFILES.in     \
+        $(Q)xgettext --default-domain=linux                         \
+            --add-comments --keyword=_ --keyword=N_                 \
+            --from-code=UTF-8                                       \
+            --files-from=$(srctree)/scripts/kconfig/POTFILES.in     \
+            --directory=$(srctree) --directory=$(objtree)           \
             --output $(obj)/config.pot
         $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
-        $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
-        $(Q)(for i in `ls arch/*/Kconfig`;               \
+        $(Q)ln -fs Kconfig.x86 arch/um/Kconfig
+        $(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \
             do                                           \
                 echo "  GEN $$i";                        \
                 $(obj)/kxgettext $$i                     \
@@ -92,7 +93,7 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
             done )
         $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
             --output $(obj)/linux.pot
-        $(Q)rm -f arch/um/Kconfig.arch
+        $(Q)rm -f $(srctree)/arch/um/Kconfig
         $(Q)rm -f $(obj)/config.pot
 
 PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
@@ -168,8 +169,11 @@ conf-objs	:= conf.o  zconf.tab.o
 mconf-objs     := mconf.o zconf.tab.o $(lxdialog)
 nconf-objs     := nconf.o zconf.tab.o nconf.gui.o
 kxgettext-objs  := kxgettext.o zconf.tab.o
+qconf-cxxobjs   := qconf.o
+qconf-objs      := kconfig_load.o zconf.tab.o
+gconf-objs      := gconf.o kconfig_load.o zconf.tab.o
 
-hostprogs-y := conf qconf gconf kxgettext
+hostprogs-y := conf
 
 ifeq ($(MAKECMDGOALS),nconfig)
         hostprogs-y += nconf
@@ -179,6 +183,10 @@ ifeq ($(MAKECMDGOALS),menuconfig)
         hostprogs-y += mconf
 endif
 
+ifeq ($(MAKECMDGOALS),update-po-config)
+        hostprogs-y += kxgettext
+endif
+
 ifeq ($(MAKECMDGOALS),xconfig)
         qconf-target := 1
 endif
@@ -188,16 +196,15 @@ endif
 
 
 ifeq ($(qconf-target),1)
-qconf-cxxobjs   := qconf.o
-qconf-objs      := kconfig_load.o zconf.tab.o
+        hostprogs-y += qconf
 endif
 
 ifeq ($(gconf-target),1)
-gconf-objs      := gconf.o kconfig_load.o zconf.tab.o
+        hostprogs-y += gconf
 endif
 
-clean-files     := lkc_defs.h qconf.moc .tmp_qtcheck \
-                   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
+clean-files     := lkc_defs.h qconf.moc .tmp_qtcheck .tmp_gtkcheck
+clean-files     += zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
 clean-files     += mconf qconf gconf nconf
 clean-files     += config.pot linux.pot
 
@@ -321,11 +328,12 @@ $(obj)/%.moc: $(src)/%.h
         $(KC_QT_MOC) -i $< -o $@
 
 $(obj)/lkc_defs.h: $(src)/lkc_proto.h
-        sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
+        $(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
 
 # Extract gconf menu items for I18N support
 $(obj)/gconf.glade.h: $(obj)/gconf.glade
-        intltool-extract --type=gettext/glade $(obj)/gconf.glade
+        $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \
+        $(obj)/gconf.glade
 
 ###
 # The following requires flex/bison/gperf
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 61c35bf2d9cb..2bafd9a7c8da 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -560,8 +560,6 @@ int conf_write(const char *name)
         const char *basename;
         const char *str;
         char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
-        time_t now;
-        int use_timestamp = 1;
         char *env;
 
         dirname[0] = 0;
@@ -598,19 +596,11 @@ int conf_write(const char *name)
         if (!out)
                 return 1;
 
-        time(&now);
-        env = getenv("KCONFIG_NOTIMESTAMP");
-        if (env && *env)
-                use_timestamp = 0;
-
         fprintf(out, _("#\n"
                        "# Automatically generated make config: don't edit\n"
                        "# %s\n"
-                       "%s%s"
                        "#\n"),
-                     rootmenu.prompt->text,
-                     use_timestamp ? "# " : "",
-                     use_timestamp ? ctime(&now) : "");
+                     rootmenu.prompt->text);
 
         if (!conf_get_changed())
                 sym_clear_all_valid();
@@ -784,7 +774,6 @@ int conf_write_autoconf(void)
         const char *str;
         const char *name;
         FILE *out, *tristate, *out_h;
-        time_t now;
         int i;
 
         sym_clear_all_valid();
@@ -811,22 +800,19 @@ int conf_write_autoconf(void)
                 return 1;
         }
 
-        time(&now);
         fprintf(out, "#\n"
                      "# Automatically generated make config: don't edit\n"
                      "# %s\n"
-                     "# %s"
                      "#\n",
-                     rootmenu.prompt->text, ctime(&now));
+                     rootmenu.prompt->text);
         fprintf(tristate, "#\n"
                           "# Automatically generated - do not edit\n"
                           "\n");
         fprintf(out_h, "/*\n"
                        " * Automatically generated C config: don't edit\n"
                        " * %s\n"
-                       " * %s"
                        " */\n",
-                       rootmenu.prompt->text, ctime(&now));
+                       rootmenu.prompt->text);
 
         for_all_symbols(i, sym) {
                 sym_calc_value(sym);
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 3d238db49764..16bfae2d3217 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -20,12 +20,8 @@ struct file {
         struct file *parent;
         const char *name;
         int lineno;
-        int flags;
 };
 
-#define FILE_BUSY               0x0001
-#define FILE_SCANNED            0x0002
-
 typedef enum tristate {
         no, mod, yes
 } tristate;
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 455896164d72..a11d5f7b9eeb 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -253,7 +253,7 @@ void init_left_tree(void)
 
         gtk_tree_view_set_model(view, model1);
         gtk_tree_view_set_headers_visible(view, TRUE);
-        gtk_tree_view_set_rules_hint(view, FALSE);
+        gtk_tree_view_set_rules_hint(view, TRUE);
 
         column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(view, column);
@@ -298,7 +298,7 @@ void init_right_tree(void)
 
         gtk_tree_view_set_model(view, model2);
         gtk_tree_view_set_headers_visible(view, TRUE);
-        gtk_tree_view_set_rules_hint(view, FALSE);
+        gtk_tree_view_set_rules_hint(view, TRUE);
 
         column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(view, column);
@@ -756,7 +756,6 @@ void on_load_clicked(GtkButton * button, gpointer user_data)
 void on_single_clicked(GtkButton * button, gpointer user_data)
 {
         view_mode = SINGLE_VIEW;
-        gtk_paned_set_position(GTK_PANED(hpaned), 0);
         gtk_widget_hide(tree1_w);
         current = &rootmenu;
         display_tree_part();
@@ -782,7 +781,6 @@ void on_split_clicked(GtkButton * button, gpointer user_data)
 void on_full_clicked(GtkButton * button, gpointer user_data)
 {
         view_mode = FULL_VIEW;
-        gtk_paned_set_position(GTK_PANED(hpaned), 0);
         gtk_widget_hide(tree1_w);
         if (tree2)
                 gtk_tree_store_clear(tree2);
@@ -1444,6 +1442,12 @@ static void display_tree(struct menu *menu)
                 if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
                     || (view_mode == FULL_VIEW)
                     || (view_mode == SPLIT_VIEW))*/
+
+                /* Change paned position if the view is not in 'split mode' */
+                if (view_mode == SINGLE_VIEW || view_mode == FULL_VIEW) {
+                        gtk_paned_set_position(GTK_PANED(hpaned), 0);
+                }
+
                 if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))
                     || (view_mode == FULL_VIEW)
                     || (view_mode == SPLIT_VIEW)) {
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
index 6eb039718259..d9182916f724 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -2363,11 +2363,11 @@ void zconf_initscan(const char *name)
 
         current_file = file_lookup(name);
         current_file->lineno = 1;
-        current_file->flags = FILE_BUSY;
 }
 
 void zconf_nextfile(const char *name)
 {
+        struct file *iter;
         struct file *file = file_lookup(name);
         struct buffer *buf = malloc(sizeof(*buf));
         memset(buf, 0, sizeof(*buf));
@@ -2383,18 +2383,25 @@ void zconf_nextfile(const char *name)
         buf->parent = current_buf;
         current_buf = buf;
 
-        if (file->flags & FILE_BUSY) {
-                printf("%s:%d: do not source '%s' from itself\n",
-                       zconf_curname(), zconf_lineno(), name);
-                exit(1);
-        }
-        if (file->flags & FILE_SCANNED) {
-                printf("%s:%d: file '%s' is already sourced from '%s'\n",
-                       zconf_curname(), zconf_lineno(), name,
-                       file->parent->name);
-                exit(1);
+        for (iter = current_file->parent; iter; iter = iter->parent ) {
+                if (!strcmp(current_file->name,iter->name) ) {
+                        printf("%s:%d: recursive inclusion detected. "
+                               "Inclusion path:\n  current file : '%s'\n",
+                               zconf_curname(), zconf_lineno(),
+                               zconf_curname());
+                        iter = current_file->parent;
+                        while (iter && \
+                               strcmp(iter->name,current_file->name)) {
+                                printf("  included from: '%s:%d'\n",
+                                       iter->name, iter->lineno-1);
+                                iter = iter->parent;
+                        }
+                        if (iter)
+                                printf("  included from: '%s:%d'\n",
+                                       iter->name, iter->lineno+1);
+                        exit(1);
+                }
         }
-        file->flags |= FILE_BUSY;
         file->lineno = 1;
         file->parent = current_file;
         current_file = file;
@@ -2404,8 +2411,6 @@ static void zconf_endfile(void)
 {
         struct buffer *parent;
 
-        current_file->flags |= FILE_SCANNED;
-        current_file->flags &= ~FILE_BUSY;
         current_file = current_file->parent;
 
         parent = current_buf->parent;
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index db56377393d7..488dd7410787 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -373,18 +373,18 @@ static void print_function_line(void)
         const int skip = 1;
 
         for (i = 0; i < function_keys_num; i++) {
-                wattrset(main_window, attributes[FUNCTION_HIGHLIGHT]);
+                (void) wattrset(main_window, attributes[FUNCTION_HIGHLIGHT]);
                 mvwprintw(main_window, LINES-3, offset,
                                 "%s",
                                 function_keys[i].key_str);
-                wattrset(main_window, attributes[FUNCTION_TEXT]);
+                (void) wattrset(main_window, attributes[FUNCTION_TEXT]);
                 offset += strlen(function_keys[i].key_str);
                 mvwprintw(main_window, LINES-3,
                                 offset, "%s",
                                 function_keys[i].func);
                 offset += strlen(function_keys[i].func) + skip;
         }
-        wattrset(main_window, attributes[NORMAL]);
+        (void) wattrset(main_window, attributes[NORMAL]);
 }
 
 /* help */
@@ -953,16 +953,16 @@ static void show_menu(const char *prompt, const char *instructions,
         current_instructions = instructions;
 
         clear();
-        wattrset(main_window, attributes[NORMAL]);
+        (void) wattrset(main_window, attributes[NORMAL]);
         print_in_middle(stdscr, 1, 0, COLS,
                         menu_backtitle,
                         attributes[MAIN_HEADING]);
 
-        wattrset(main_window, attributes[MAIN_MENU_BOX]);
+        (void) wattrset(main_window, attributes[MAIN_MENU_BOX]);
         box(main_window, 0, 0);
-        wattrset(main_window, attributes[MAIN_MENU_HEADING]);
+        (void) wattrset(main_window, attributes[MAIN_MENU_HEADING]);
         mvwprintw(main_window, 0, 3, " %s ", prompt);
-        wattrset(main_window, attributes[NORMAL]);
+        (void) wattrset(main_window, attributes[NORMAL]);
 
         set_menu_items(curses_menu, curses_menu_items);
 
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 06dd2e33581d..c2796b866f8f 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1489,8 +1489,7 @@ void ConfigMainWindow::saveConfigAs(void)
         QString s = Q3FileDialog::getSaveFileName(conf_get_configname(), NULL, this);
         if (s.isNull())
                 return;
-        if (conf_write(QFile::encodeName(s)))
-                QMessageBox::information(this, "qconf", _("Unable to save configuration!"));
+        saveConfig();
 }
 
 void ConfigMainWindow::searchConfig(void)
@@ -1643,7 +1642,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e)
         mb.setButtonText(QMessageBox::Cancel, _("Cancel Exit"));
         switch (mb.exec()) {
         case QMessageBox::Yes:
-                conf_write(NULL);
+                saveConfig();
         case QMessageBox::No:
                 e->accept();
                 break;
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 3dbaec185cc4..b22f884f9022 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -294,11 +294,11 @@ void zconf_initscan(const char *name)
 
         current_file = file_lookup(name);
         current_file->lineno = 1;
-        current_file->flags = FILE_BUSY;
 }
 
 void zconf_nextfile(const char *name)
 {
+        struct file *iter;
         struct file *file = file_lookup(name);
         struct buffer *buf = malloc(sizeof(*buf));
         memset(buf, 0, sizeof(*buf));
@@ -314,18 +314,25 @@ void zconf_nextfile(const char *name)
         buf->parent = current_buf;
         current_buf = buf;
 
-        if (file->flags & FILE_BUSY) {
-                printf("%s:%d: do not source '%s' from itself\n",
-                       zconf_curname(), zconf_lineno(), name);
-                exit(1);
-        }
-        if (file->flags & FILE_SCANNED) {
-                printf("%s:%d: file '%s' is already sourced from '%s'\n",
-                       zconf_curname(), zconf_lineno(), name,
-                       file->parent->name);
-                exit(1);
+        for (iter = current_file->parent; iter; iter = iter->parent ) {
+                if (!strcmp(current_file->name,iter->name) ) {
+                        printf("%s:%d: recursive inclusion detected. "
+                               "Inclusion path:\n  current file : '%s'\n",
+                               zconf_curname(), zconf_lineno(),
+                               zconf_curname());
+                        iter = current_file->parent;
+                        while (iter && \
+                               strcmp(iter->name,current_file->name)) {
+                                printf("  included from: '%s:%d'\n",
+                                       iter->name, iter->lineno-1);
+                                iter = iter->parent;
+                        }
+                        if (iter)
+                                printf("  included from: '%s:%d'\n",
+                                       iter->name, iter->lineno+1);
+                        exit(1);
+                }
         }
-        file->flags |= FILE_BUSY;
         file->lineno = 1;
         file->parent = current_file;
         current_file = file;
@@ -335,8 +342,6 @@ static void zconf_endfile(void)
 {
         struct buffer *parent;
 
-        current_file->flags |= FILE_SCANNED;
-        current_file->flags &= ~FILE_BUSY;
         current_file = current_file->parent;
 
         parent = current_buf->parent;
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index 50ad317a4bf9..f221ddf69080 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -42,6 +42,16 @@ if [ -z "$KBUILD_BUILD_TIMESTAMP" ]; then
 else
         TIMESTAMP=$KBUILD_BUILD_TIMESTAMP
 fi
+if test -z "$KBUILD_BUILD_USER"; then
+        LINUX_COMPILE_BY=$(whoami | sed 's/\\/\\\\/')
+else
+        LINUX_COMPILE_BY=$KBUILD_BUILD_USER
+fi
+if test -z "$KBUILD_BUILD_HOST"; then
+        LINUX_COMPILE_HOST=`hostname`
+else
+        LINUX_COMPILE_HOST=$KBUILD_BUILD_HOST
+fi
 
 UTS_VERSION="#$VERSION"
 CONFIG_FLAGS=""
@@ -63,20 +73,8 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
 
   echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
 
-  echo \#define LINUX_COMPILE_TIME \"`date +%T`\"
-  echo \#define LINUX_COMPILE_BY \"`whoami`\"
-  echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
-
-  domain=`dnsdomainname 2> /dev/null`
-  if [ -z "$domain" ]; then
-    domain=`domainname 2> /dev/null`
-  fi
-
-  if [ -n "$domain" ]; then
-    echo \#define LINUX_COMPILE_DOMAIN \"`echo $domain | $UTS_TRUNCATE`\"
-  else
-    echo \#define LINUX_COMPILE_DOMAIN
-  fi
+  echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\"
+  echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\"
 
   echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
 ) > .tmpcompile
@@ -91,8 +89,8 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
 # first line.
 
 if [ -r $TARGET ] && \
-      grep -v 'UTS_VERSION\|LINUX_COMPILE_TIME' $TARGET > .tmpver.1 && \
-      grep -v 'UTS_VERSION\|LINUX_COMPILE_TIME' .tmpcompile > .tmpver.2 && \
+      grep -v 'UTS_VERSION' $TARGET > .tmpver.1 && \
+      grep -v 'UTS_VERSION' .tmpcompile > .tmpver.2 && \
       cmp -s .tmpver.1 .tmpver.2; then
    rm -f .tmpcompile
 else
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 88f3f07205f8..e26e2fb462d4 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -702,6 +702,24 @@ static int do_ssb_entry(const char *filename,
         return 1;
 }
 
+/* Looks like: bcma:mNidNrevNclN. */
+static int do_bcma_entry(const char *filename,
+                         struct bcma_device_id *id, char *alias)
+{
+        id->manuf = TO_NATIVE(id->manuf);
+        id->id = TO_NATIVE(id->id);
+        id->rev = TO_NATIVE(id->rev);
+        id->class = TO_NATIVE(id->class);
+
+        strcpy(alias, "bcma:");
+        ADD(alias, "m", id->manuf != BCMA_ANY_MANUF, id->manuf);
+        ADD(alias, "id", id->id != BCMA_ANY_ID, id->id);
+        ADD(alias, "rev", id->rev != BCMA_ANY_REV, id->rev);
+        ADD(alias, "cl", id->class != BCMA_ANY_CLASS, id->class);
+        add_wildcard(alias);
+        return 1;
+}
+
 /* Looks like: virtio:dNvN */
 static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
                            char *alias)
@@ -968,6 +986,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct ssb_device_id), "ssb",
                          do_ssb_entry, mod);
+        else if (sym_is(symname, "__mod_bcma_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct bcma_device_id), "bcma",
+                         do_bcma_entry, mod);
         else if (sym_is(symname, "__mod_virtio_device_table"))
                 do_table(symval, sym->st_size,
                          sizeof(struct virtio_device_id), "virtio",
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index a834b935f536..006960ebbce9 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -26,9 +26,9 @@ RPM := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
                    else echo rpm; fi)
 
 # Remove hyphens since they have special meaning in RPM filenames
-KERNELPATH := kernel-$(subst -,,$(KERNELRELEASE))
+KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))
 MKSPEC     := $(srctree)/scripts/package/mkspec
-PREV       := set -e; cd ..;
+PREV       := set -e; cd -P ..;
 
 # rpm-pkg
 # ---------------------------------------------------------------------------
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index e1c1d5b8ca70..4bf17ddf7c7f 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -22,7 +22,7 @@ if [ "`grep CONFIG_DRM=y .config | cut -f2 -d\=`" = "y" ]; then
 fi
 
 PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-__KERNELRELEASE=`echo $KERNELRELEASE | sed -e "s/-//g"`
+__KERNELRELEASE=`echo $KERNELRELEASE | sed -e "s/-/_/g"`
 
 echo "Name: kernel"
 echo "Summary: The Linux Kernel"
@@ -47,6 +47,18 @@ echo ""
 echo "%description"
 echo "The Linux Kernel, the operating system core itself"
 echo ""
+echo "%package headers"
+echo "Summary: Header files for the Linux kernel for use by glibc"
+echo "Group: Development/System"
+echo "Obsoletes: kernel-headers"
+echo "Provides: kernel-headers = %{version}"
+echo "%description headers"
+echo "Kernel-headers includes the C header files that specify the interface"
+echo "between the Linux kernel and userspace libraries and programs.  The"
+echo "header files define structures and constants that are needed for"
+echo "building most standard programs and are also needed for rebuilding the"
+echo "glibc package."
+echo ""
 
 if ! $PREBUILT; then
 echo "%prep"
@@ -83,6 +95,7 @@ echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE"
 echo "%endif"
 echo "%endif"
 
+echo 'make %{?_smp_mflags} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install'
 echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$KERNELRELEASE"
 
 echo 'cp .config $RPM_BUILD_ROOT'"/boot/config-$KERNELRELEASE"
@@ -105,3 +118,7 @@ echo "/lib/modules/$KERNELRELEASE"
 echo "/lib/firmware"
 echo "/boot/*"
 echo ""
+echo "%files headers"
+echo '%defattr (-, root, root)'
+echo "/usr/include"
+echo ""
diff --git a/scripts/patch-kernel b/scripts/patch-kernel
index 46a59cae3a0a..20fb25c23382 100755
--- a/scripts/patch-kernel
+++ b/scripts/patch-kernel
@@ -250,7 +250,7 @@ while :				# incrementing SUBLEVEL (s in v.p.s)
 do
     CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"
     EXTRAVER=
-    if [ $STOPFULLVERSION = $CURRENTFULLVERSION ]; then
+    if [ x$STOPFULLVERSION = x$CURRENTFULLVERSION ]; then
         echo "Stopping at $CURRENTFULLVERSION base as requested."
         break
     fi