1. 12 9月, 2013 32 次提交
  2. 11 9月, 2013 8 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · e831cbfc
      Linus Torvalds 提交于
      Pull more s390 updates from Heiko Carstens:
       "This includes one bpf/jit bug fix where the jit compiler could
        sometimes write generated code out of bounds of the allocated memory
        area.
      
        The rest of the patches are only cleanups and minor improvements"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/irq: reduce size of external interrupt handler hash array
        s390/compat,uid16: use current_cred()
        s390/ap_bus: use and-mask instead of a cast
        s390/ftrace: avoid pointer arithmetics with function pointers
        s390: make various functions static, add declarations to header files
        s390/compat signal: add couple of __force annotations
        s390/mm: add __releases()/__acquires() annotations to gmap_alloc_table()
        s390: keep Kconfig sorted
        s390/irq: rework irq subclass handling
        s390/irq: use hlists for external interrupt handler array
        s390/dumpstack: convert print_symbol to %pSR
        s390/perf: Remove print_hex_dump_bytes() debug output
        s390: update defconfig
        s390/bpf,jit: fix address randomization
      e831cbfc
    • L
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 5b419784
      Linus Torvalds 提交于
      Pull kconfig updates from Michal Marek:
       "This is the kconfig part of kbuild for v3.12-rc1:
         - post-3.11 search code fixes and micro-optimizations
         - CONFIG_MODULES is no longer a special case; this is needed to
           eventually fix the bug that using KCONFIG_ALLCONFIG breaks
           allmodconfig
         - long long is used to store hex and int values
         - make silentoldconfig no longer warns when a symbol changes from
           tristate to bool (it's a job for make oldconfig)
         - scripts/diffconfig updated to work with newer Pythons
         - scripts/config does not rely on GNU sed extensions"
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kconfig: do not allow more than one symbol to have 'option modules'
        kconfig: regenerate bison parser
        kconfig: do not special-case 'MODULES' symbol
        diffconfig: Update script to support python versions 2.5 through 3.3
        diffconfig: Gracefully exit if the default config files are not present
        modules: do not depend on kconfig to set 'modules' option to symbol MODULES
        kconfig: silence warning when parsing auto.conf when a symbol has changed type
        scripts/config: use sed's POSIX interface
        kconfig: switch to "long long" for sanity
        kconfig: simplify symbol-search code
        kconfig: don't allocate n+1 elements in temporary array
        kconfig: minor style fixes in symbol-search code
        kconfig/[mn]conf: shorten title in search-box
        kconfig: avoid multiple calls to strlen
        Documentation/kconfig: more concise and straightforward search explanation
      5b419784
    • L
      Merge tag 'for-v3.12' of git://git.infradead.org/battery-2.6 · a22a0fdb
      Linus Torvalds 提交于
      Pull battery/power supply driver updates from Anton Vorontsov:
       "New drivers:
      
         - APM X-Gene system reboot driver by Feng Kan and Loc Ho (APM).
      
         - Qualcomm MSM reboot/poweroff driver by Abhimanyu Kapur (Codeaurora).
      
         - Texas Instruments BQ24190 charger driver by Mark A.  Greer (Animal
           Creek Technologies).
      
         - Texas Instruments TWL4030 MADC battery driver by Lukas Märdian and
           Marek Belisko (Golden Delicious Computers).  The driver is used on
           Freerunner GTA04 phones.
      
        Highlighted fixes and improvements:
      
         - Suspend/wakeup logic improvements: power supply objects will block
           system suspend until all power supply events are processed.  Thanks
           to Zoran Markovic (Linaro), Arve Hjonnevag and Todd Poynor (Google)"
      
      * tag 'for-v3.12' of git://git.infradead.org/battery-2.6:
        rx51_battery: Fix channel number when reading adc value
        power: Add twl4030_madc battery driver.
        bq24190_charger: Workaround SS definition problem on i386 builds
        power_supply: Prevent suspend until power supply events are processed
        vexpress-poweroff: Should depend on the required infrastructure
        twl4030-charger: Fix compiler warning with regulator_enable()
        rx51_battery: Replace hardcoded channels values.
        bq24190_charger: Add support for TI BQ24190 Battery Charger
        ab8500-charger: We print an unintended error message
        max8925_power: Fix missing of_node_put
        power_supply: Replace strict_strtol() with kstrtol()
        power: Add APM X-Gene system reboot driver
        power_supply: tosa_battery: Get rid of irq_to_gpio usage
        power supply: collie_battery: Convert to use dev_pm_ops
        power_supply: Make goldfish_battery depend on GOLDFISH || COMPILE_TEST
        power: reset: Add msm restart support
        MAINTAINERS: drivers/power: add entry for SmartReflex AVS drivers
      a22a0fdb
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · bf83e614
      Linus Torvalds 提交于
      Pull powerpc fixes from Ben Herrenschmidt:
       "Here are a handful of small powerpc fixes.
      
        A couple of section mismatches (always worth fixing), a missing export
        of a new symbol causing build failures of modules, a page fault
        deadlock fix (interestingly that bug has been around for a LONG time,
        though it seems to be more easily triggered by KVM) and fixing pseries
        default idle loop in the absence of the cpuidle drivers (such as
        during boot)"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: Default arch idle could cede processor on pseries
        fbdev/ps3fb: Fix section mismatch warning for ps3fb_probe
        powerpc: Fix section mismatch warning for prom_rtas_call
        powerpc: Fix possible deadlock on page fault
        powerpc: Export cpu_to_chip_id() to fix build error
      bf83e614
    • L
      Merge tag 'stable/for-linus-3.12-rc0-tag-two' of... · a60d4b98
      Linus Torvalds 提交于
      Merge tag 'stable/for-linus-3.12-rc0-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
      
      Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
       "This pull I usually do after rc1 is out but because we have a nice
        amount of fixes, some bootup related fixes for ARM, and it is early in
        the cycle we figured to do it now to help with tracking of potential
        regressions.
      
        The simple ones are the ARM ones - one of the patches fell through the
        cracks, other fixes a bootup issue (unconditionally using Xen
        functions).  Then a fix for a regression causing preempt count being
        off (patch causing this went in v3.12).
      
        Lastly are the fixes to make Xen PVHVM guests use PV ticketlocks (Xen
        PV already does).
      
        The enablement of that was supposed to be part of the x86 spinlock
        merge in commit 816434ec ("The biggest change here are
        paravirtualized ticket spinlocks (PV spinlocks), which bring a nice
        speedup on various benchmarks...") but unfortunatly it would cause
        hang when booting Xen PVHVM guests.  Yours truly got all of the bugs
        fixed last week and they (six of them) are included in this pull.
      
        Bug-fixes:
         - Boot on ARM without using Xen unconditionally
         - On Xen ARM don't run cpuidle/cpufreq
         - Fix regression in balloon driver, preempt count warnings
         - Fixes to make PVHVM able to use pv ticketlock.
         - Revert Xen PVHVM disabling pv ticketlock (aka, re-enable pv ticketlocks)"
      
      * tag 'stable/for-linus-3.12-rc0-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/spinlock: Don't use __initdate for xen_pv_spin
        Revert "xen/spinlock: Disable IRQ spinlock (PV) allocation on PVHVM"
        xen/spinlock: Don't setup xen spinlock IPI kicker if disabled.
        xen/smp: Update pv_lock_ops functions before alternative code starts under PVHVM
        xen/spinlock: We don't need the old structure anymore
        xen/spinlock: Fix locking path engaging too soon under PVHVM.
        xen/arm: disable cpuidle and cpufreq when linux is running as dom0
        xen/p2m: Don't call get_balloon_scratch_page() twice, keep interrupts disabled for multicalls
        ARM: xen: only set pm function ptrs for Xen guests
      a60d4b98
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · fa1586a7
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Daniel had some fixes queued up, that were delayed, the stolen memory
        ones and vga arbiter ones are quite useful, along with his usual bunch
        of stuff, nothing for HSW outputs yet.
      
        The one nouveau fix is for a regression I caused with the poweroff stuff"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (30 commits)
        drm/nouveau: fix oops on runtime suspend/resume
        drm/i915: Delay disabling of VGA memory until vgacon->fbcon handoff is done
        drm/i915: try not to lose backlight CBLV precision
        drm/i915: Confine page flips to BCS on Valleyview
        drm/i915: Skip stolen region initialisation if none is reserved
        drm/i915: fix gpu hang vs. flip stall deadlocks
        drm/i915: Hold an object reference whilst we shrink it
        drm/i915: fix i9xx_crtc_clock_get for multiplied pixels
        drm/i915: handle sdvo input pixel multiplier correctly again
        drm/i915: fix hpd work vs. flush_work in the pageflip code deadlock
        drm/i915: fix up the relocate_entry refactoring
        drm/i915: Fix pipe config warnings when dealing with LVDS fixed mode
        drm/i915: Don't call sg_free_table() if sg_alloc_table() fails
        i915: Update VGA arbiter support for newer devices
        vgaarb: Fix VGA decodes changes
        vgaarb: Don't disable resources that are not owned
        drm/i915: Pin pages whilst mapping the dma-buf
        drm/i915: enable trickle feed on Haswell
        x86: add early quirk for reserving Intel graphics stolen memory v5
        drm/i915: split PCI IDs out into i915_drm.h v4
        ...
      fa1586a7
    • L
      Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux · cf596766
      Linus Torvalds 提交于
      Pull nfsd updates from Bruce Fields:
       "This was a very quiet cycle! Just a few bugfixes and some cleanup"
      
      * 'nfsd-next' of git://linux-nfs.org/~bfields/linux:
        rpc: let xdr layer allocate gssproxy receieve pages
        rpc: fix huge kmalloc's in gss-proxy
        rpc: comment on linux_cred encoding, treat all as unsigned
        rpc: clean up decoding of gssproxy linux creds
        svcrpc: remove unused rq_resused
        nfsd4: nfsd4_create_clid_dir prints uninitialized data
        nfsd4: fix leak of inode reference on delegation failure
        Revert "nfsd: nfs4_file_get_access: need to be more careful with O_RDWR"
        sunrpc: prepare NFS for 2038
        nfsd4: fix setlease error return
        nfsd: nfs4_file_get_access: need to be more careful with O_RDWR
      cf596766
    • L
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 516f7b3f
      Linus Torvalds 提交于
      Pull hwmon cleanups from Guenter Roeck:
       "Minor cleanup in ina2xx and hwmon-vid drivers; no functional changes"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (ina2xx) Remove casting the return value which is a void pointer
        hwmon: (hwmon-vid) Add __maybe_unused attribute to dummy variable
      516f7b3f