1. 04 Jun, 2013 36 commits
  2. 20 May, 2013 4 commits
    • Linus Torvalds's avatar
      Linux 3.10-rc2 · c7788792
      Linus Torvalds authored
      c7788792
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.10-rc1-tag' of... · 669c7433
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.10-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen fixes from Konrad Rzeszutek Wilk:
       - Regression fix in xen privcmd fixing a memory leak.
       - Add Documentation for tmem driver.
       - Simplify and remove code in the tmem driver.
       - Cleanups.
      
      * tag 'stable/for-linus-3.10-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: Fixed assignment error in if statement
        xen/xenbus: Fixed over 80 character limit issue
        xen/xenbus: Fixed indentation error in switch case
        xen/tmem: Don't use self[ballooning|shrinking] if frontswap is off.
        xen/tmem: Remove the usage of '[no|]selfballoon' and use 'tmem.selfballooning' bool instead.
        xen/tmem: Remove the usage of 'noselfshrink' and use 'tmem.selfshrink' bool instead.
        xen/tmem: Remove the boot options and fold them in the tmem.X parameters.
        xen/tmem: s/disable_// and change the logic.
        xen/tmem: Fix compile warning.
        xen/tmem: Split out the different module/boot options.
        xen/tmem: Move all of the boot and module parameters to the top of the file.
        xen/tmem: Cleanup. Remove the parts that say temporary.
        xen/privcmd: fix condition in privcmd_close()
      669c7433
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 622f2234
      Linus Torvalds authored
      Pull hwmon fixes from Guenter Roeck:
      
       - Error path fixes for abituguru and iio_hwmon drivers.
      
       - Drop erroneously created attributes from nct6775 driver.
      
       - Drop redundant safety on cache lifetime for tmp401 driver.
      
       - Add explicit maintainer for LM95234 and TMP401 drivers.
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        MAINTAINERS: Add myself as maintainer for LM95234 and TMP401 drivers
        hwmon: (tmp401) Drop redundant safety on cache lifetime
        hwmon: fix error return code in abituguru_probe()
        hwmon: (iio_hwmon) Fix null pointer dereference
        hwmon: (nct6775) Do not create non-existing attributes
        hwmon: (iio_hwmon) Fix missing iio_channel_release_all call if devm_kzalloc fail
      622f2234
    • Linus Torvalds's avatar
      x86: Fix bit corruption at CPU resume time · 5e427ec2
      Linus Torvalds authored
      In commit 78d77df7 ("x86-64, init: Do not set NX bits on non-NX
      capable hardware") we added the early_pmd_flags that gets the NX bit set
      when a CPU supports NX. However, the new variable was marked __initdata,
      because the main _use_ of this is in an __init routine.
      
      However, the bit setting happens from secondary_startup_64(), which is
      called not only at bootup, but on every secondary CPU start.  Including
      resuming from STR and at CPU hotplug time.  So the value cannot be
      __initdata.
      Reported-bisected-and-tested-by: default avatarMichal Hocko <mhocko@suse.cz>
      Cc: stable@vger.kernel.org # v3.9
      Acked-by: default avatarPeter Anvin <hpa@linux.intel.com>
      Cc: Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5e427ec2