Merge branch 'for-linus' of git://github.com/richardweinberger/linux

* 'for-linus' of git://github.com/richardweinberger/linux: (90 commits)
  um: fix ubd cow size
  um: Fix kmalloc argument order in um/vdso/vma.c
  um: switch to use of drivers/Kconfig
  UserModeLinux-HOWTO.txt: fix a typo
  UserModeLinux-HOWTO.txt: remove ^H characters
  um: we need sys/user.h only on i386
  um: merge delay_{32,64}.c
  um: distribute exports to where exported stuff is defined
  um: kill system-um.h
  um: generic ftrace.h will do...
  um: segment.h is x86-only and needed only there
  um: asm/pda.h is not needed anymore
  um: hw_irq.h can go generic as well
  um: switch to generic-y
  um: clean Kconfig up a bit
  um: a couple of missing dependencies...
  um: kill useless argument of free_chan() and free_one_chan()
  um: unify ptrace_user.h
  um: unify KSTK_...
  um: fix gcov build breakage
  ...

diff --combined drivers/char/hw_random/Kconfig
index e013587,e5cd79c..0689bf6
--- 1/drivers/char/hw_random/Kconfig
--- 2/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@@ -60,19 -60,6 +60,19 @@@ config HW_RANDOM_AM
  
          If unsure, say Y.
  
 +config HW_RANDOM_ATMEL
 +      tristate "Atmel Random Number Generator support"
 +      depends on HW_RANDOM && ARCH_AT91SAM9G45
 +      default HW_RANDOM
 +      ---help---
 +        This driver provides kernel-side support for the Random Number
 +        Generator hardware found on Atmel AT91 devices.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called atmel-rng.
 +
 +        If unsure, say Y.
 +
  config HW_RANDOM_GEODE
        tristate "AMD Geode HW Random Number Generator support"
        depends on HW_RANDOM && X86_32 && PCI
@@@ -235,3 -222,18 +235,18 @@@ config HW_RANDOM_PPC4X
         module will be called ppc4xx-rng.
  
         If unsure, say N.
+ 
+ config UML_RANDOM
+       depends on UML
+       tristate "Hardware random number generator"
+       help
+         This option enables UML's "hardware" random number generator.  It
+         attaches itself to the host's /dev/random, supplying as much entropy
+         as the host has, rather than the small amount the UML gets from its
+         own drivers.  It registers itself as a standard hardware random number
+         generator, major 10, minor 183, and the canonical device name is
+         /dev/hwrng.
+         The way to make use of this is to install the rng-tools package
+         (check your distro, or download from
+         http://sourceforge.net/projects/gkernel/).  rngd periodically reads
+         /dev/hwrng and injects the entropy into /dev/random.

diff --combined drivers/net/wireless/ath/Kconfig
index 0735488,47d0de8..0960224
--- 1/drivers/net/wireless/ath/Kconfig
--- 2/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
  menuconfig ATH_COMMON
        tristate "Atheros Wireless Cards"
-       depends on CFG80211
+       depends on CFG80211 && (!UML || BROKEN)
        ---help---
          This will enable the support for the Atheros wireless drivers.
          ath5k, ath9k, ath9k_htc and ar9170 drivers share some common code, this option
@@@ -25,6 -25,5 +25,6 @@@ config ATH_DEBU
  source "drivers/net/wireless/ath/ath5k/Kconfig"
  source "drivers/net/wireless/ath/ath9k/Kconfig"
  source "drivers/net/wireless/ath/carl9170/Kconfig"
 +source "drivers/net/wireless/ath/ath6kl/Kconfig"
  
  endif

diff --combined drivers/tty/Kconfig
index 8816f53,aa07914..b3d1741
--- 1/drivers/tty/Kconfig
--- 2/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
  config VT
        bool "Virtual terminal" if EXPERT
-       depends on !S390
+       depends on !S390 && !UML
        select INPUT
        default y
        ---help---
@@@ -60,13 -60,9 +60,13 @@@ config VT_CONSOL
  
          If unsure, say Y.
  
 +config VT_CONSOLE_SLEEP
 +      def_bool y
 +      depends on VT_CONSOLE && PM_SLEEP
 +
  config HW_CONSOLE
        bool
 -      depends on VT && !S390 && !UML
 +      depends on VT && !UML
        default y
  
  config VT_HW_CONSOLE_BINDING
@@@ -354,37 -350,3 +354,37 @@@ config TRACE_SIN
  
          If you select this option, you need to select
          "Trace data router for MIPI P1149.7 cJTAG standard".
 +
 +config PPC_EPAPR_HV_BYTECHAN
 +      tristate "ePAPR hypervisor byte channel driver"
 +      depends on PPC
 +      help
 +        This driver creates /dev entries for each ePAPR hypervisor byte
 +        channel, thereby allowing applications to communicate with byte
 +        channels as if they were serial ports.
 +
 +config PPC_EARLY_DEBUG_EHV_BC
 +      bool "Early console (udbg) support for ePAPR hypervisors"
 +      depends on PPC_EPAPR_HV_BYTECHAN
 +      help
 +        Select this option to enable early console (a.k.a. "udbg") support
 +        via an ePAPR byte channel.  You also need to choose the byte channel
 +        handle below.
 +
 +config PPC_EARLY_DEBUG_EHV_BC_HANDLE
 +      int "Byte channel handle for early console (udbg)"
 +      depends on PPC_EARLY_DEBUG_EHV_BC
 +      default 0
 +      help
 +        If you want early console (udbg) output through a byte channel,
 +        specify the handle of the byte channel to use.
 +
 +        For this to work, the byte channel driver must be compiled
 +        in-kernel, not as a module.
 +
 +        Note that only one early console driver can be enabled, so don't
 +        enable any others if you enable this one.
 +
 +        If the number you specify is not a valid byte channel handle, then
 +        there simply will be no early console output.  This is true also
 +        if you don't boot under a hypervisor at all.

diff --combined security/integrity/ima/Kconfig
index 19c053b,5294d73..4f554f2
--- 1/security/integrity/ima/Kconfig
--- 2/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@@ -3,13 -3,12 +3,13 @@@
  config IMA
        bool "Integrity Measurement Architecture(IMA)"
        depends on SECURITY
 +      select INTEGRITY
        select SECURITYFS
        select CRYPTO
        select CRYPTO_HMAC
        select CRYPTO_MD5
        select CRYPTO_SHA1
-       select TCG_TPM if !S390
+       select TCG_TPM if !S390 && !UML
        select TCG_TIS if TCG_TPM
        help
          The Trusted Computing Group(TCG) runtime Integrity