1. 17 12月, 2012 5 次提交
  2. 16 12月, 2012 11 次提交
    • L
      Revert "x86-64/efi: Use EFI to deal with platform wall clock (again)" · 11520e5e
      Linus Torvalds 提交于
      This reverts commit bd52276f ("x86-64/efi: Use EFI to deal with
      platform wall clock (again)"), and the two supporting commits:
      
        da5a108d: "x86/kernel: remove tboot 1:1 page table creation code"
      
        185034e7: "x86, efi: 1:1 pagetable mapping for virtual EFI calls")
      
      as they all depend semantically on commit 53b87cf0 ("x86, mm:
      Include the entire kernel memory map in trampoline_pgd") that got
      reverted earlier due to the problems it caused.
      
      This was pointed out by Yinghai Lu, and verified by me on my Macbook Air
      that uses EFI.
      Pointed-out-by: NYinghai Lu <yinghai@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      11520e5e
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 5bd665f2
      Linus Torvalds 提交于
      Pull target updates from Nicholas Bellinger:
       "It has been a very busy development cycle this time around in target
        land, with the highlights including:
      
         - Kill struct se_subsystem_dev, in favor of direct se_device usage
           (hch)
         - Simplify reservations code by combining SPC-3 + SCSI-2 support for
           virtual backends only (hch)
         - Simplify ALUA code for virtual only backends, and remove left over
           abstractions (hch)
         - Pass sense_reason_t as return value for I/O submission path (hch)
         - Refactor MODE_SENSE emulation to allow for easier addition of new
           mode pages.  (roland)
         - Add emulation of MODE_SELECT (roland)
         - Fix bug in handling of ExpStatSN wrap-around (steve)
         - Fix bug in TMR ABORT_TASK lookup in qla2xxx target (steve)
         - Add WRITE_SAME w/ UNMAP=0 support for IBLOCK backends (nab)
         - Convert ib_srpt to use modern target_submit_cmd caller + drop
           legacy ioctx->kref usage (nab)
         - Convert ib_srpt to use modern target_submit_tmr caller (nab)
         - Add link_magic for fabric allow_link destination target_items for
           symlinks within target_core_fabric_configfs.c code (nab)
         - Allocate pointers in instead of full structs for
           config_group->default_groups (sebastian)
         - Fix 32-bit highmem breakage for FILEIO (sebastian)
      
        All told, hch was able to shave off another ~1K LOC by killing the
        se_subsystem_dev abstraction, along with a number of PR + ALUA
        simplifications.  Also, a nice patch by Roland is the refactoring of
        MODE_SENSE handling, along with the addition of initial MODE_SELECT
        emulation support for virtual backends.
      
        Sebastian found a long-standing issue wrt to allocation of full
        config_group instead of pointers for config_group->default_group[]
        setup in a number of areas, which ends up saving memory with big
        configurations.  He also managed to fix another long-standing BUG wrt
        to broken 32-bit highmem support within the FILEIO backend driver.
      
        Thank you again to everyone who contributed this round!"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (50 commits)
        target/iscsi_target: Add NodeACL tags for initiator group support
        target/tcm_fc: fix the lockdep warning due to inconsistent lock state
        sbp-target: fix error path in sbp_make_tpg()
        sbp-target: use simple assignment in tgt_agent_rw_agent_state()
        iscsi-target: use kstrdup() for iscsi_param
        target/file: merge fd_do_readv() and fd_do_writev()
        target/file: Fix 32-bit highmem breakage for SGL -> iovec mapping
        target: Add link_magic for fabric allow_link destination target_items
        ib_srpt: Convert TMR path to target_submit_tmr
        ib_srpt: Convert I/O path to target_submit_cmd + drop legacy ioctx->kref
        target: Make spc_get_write_same_sectors return sector_t
        target/configfs: use kmalloc() instead of kzalloc() for default groups
        target/configfs: allocate only 6 slots for dev_cg->default_groups
        target/configfs: allocate pointers instead of full struct for default_groups
        target: update error handling for sbc_setup_write_same()
        iscsit: use GFP_ATOMIC under spin lock
        iscsi_target: Remove redundant null check before kfree
        target/iblock: Forward declare bio helpers
        target: Clean up flow in transport_check_aborted_status()
        target: Clean up logic in transport_put_cmd()
        ...
      5bd665f2
    • L
      Merge tag 'char-misc-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 115b1cc2
      Linus Torvalds 提交于
      Pull EXTCON patches from Greg Kroah-Hartman:
       "Here are some drivers/extcon/ patches that I forgot to have you pull
        in the larger char/misc patchset from yesterday, for the 3.8-rc1
        kernel.
      
        Nothing major here, just some driver updates, and cleanups, all of
        which have been in linux-next for a while now.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'char-misc-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        extcon: kernel_doc style fix
        extcon: max77693: Fix uninitialised variable warning
        extcon: max77693: Use devm_kzalloc
        extcon: max8997: Use devm_kzalloc
        extcon: max8997: Fix a typo
        extcon: max8997: Fix checkpatch error
        extcon: max77693: Fix coding style
        extcon: max77693: Fix incorrect error check and return value
        extcon: max8997: Fix incorrect error check and return value
        extcon: Fix return value in extcon-class.c
        extcon: Add missing header file to extcon.h
        extcon: arizona: unlock mutex on error path in arizona_micdet()
      115b1cc2
    • L
      Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux · 2b831888
      Linus Torvalds 提交于
      Pull fbdev changes from Tomi Valkeinen:
       "OMAPDSS changes, including:
         - use dynanic debug prints
         - OMAP platform dependency removals
         - Creation of compat-layer, helping us to improve omapdrm
         - Misc cleanups, aiming to make omadss more in line with the upcoming
           common display framework
      
        Exynos DP changes for the 3.8 merge window:
         - Device Tree support for Samsung Exynos DP
         - SW Link training is cleaned up.
         - HPD interrupt is supported.
      
        Samsung Framebuffer changes for the 3.8 merge window:
         - The bit definitions of header file are updated.
         - Some minor typos are fixed.
         - Some minor bugs of s3c_fb_check_var() are fixed.
      
        FB related changes for SH Mobile, Freescale DIU
      
        Add support for the Solomon SSD1307 OLED Controller"
      
      * tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux: (191 commits)
        OMAPDSS: fix TV-out issue with DSI PLL
        Revert "OMAPFB: simplify locking"
        OMAPFB: remove silly loop in fb2display()
        OMAPFB: fix error handling in omapfb_find_best_mode()
        OMAPFB: use devm_kzalloc to allocate omapfb2_device
        OMAPDSS: DISPC: remove dispc fck uses
        OMAPDSS: DISPC: get dss clock rate from dss driver
        drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
        drivers/video: add support for the Solomon SSD1307 OLED Controller
        OMAPDSS: use omapdss_compat_init() in other drivers
        OMAPDSS: export dispc functions
        OMAPDSS: export dss_feat functions
        OMAPDSS: export dss_mgr_ops functions
        OMAPDSS: separate compat files in the Makefile
        OMAPDSS: move display sysfs init to compat layer
        OMAPDSS: DPI: use dispc's check_timings
        OMAPDSS: DISPC: add dispc_ovl_check()
        OMAPDSS: move irq handling to dispc-compat
        OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c
        OMAPDSS: move blocking mgr enable/disable to compat layer
        ...
      
      Conflicts:
      	arch/arm/mach-davinci/devices-da8xx.c
      	arch/arm/plat-omap/common.c
      	drivers/media/platform/omap/omap_vout.c
      2b831888
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds · e81d372f
      Linus Torvalds 提交于
      Pull LED subsystem update from Bryan Wu.
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (47 commits)
        leds: leds-lp5521: return an error code on error in probe()
        leds: leds-clevo-mail: Use pr_* instead of printks
        leds: leds-rb532: Fix checkpatch errors
        leds: led-triggers: Fix checkpatch warnings
        leds: ledtrig-backlight: Fix checkpatch error
        leds: leds-wrap: Use <linux/io.h> instead of <asm/io.h>
        leds: leds-wm8350: Use dev_err instead of printk
        leds: leds-pwm: Fix checkpatch warning
        leds: leds-pca955x: Use dev_info instead of printk
        leds: leds-net48xx: Use linux/io.h instead of asm/io.h
        leds: leds-lt3593: Fix checkpatch warnings
        leds: leds-gpio: Use dev_info instead of printk
        leds: leds-da903x: Fix checkpatch error and warnings
        leds: leds-bd2802: Fix checkpatch warnings
        leds: leds-adp5520: Fix checkpatch warnings
        leds: led-class: Fix checkpatch warning
        leds: leds-ns2: use devm_gpio_request_one
        leds: leds-lt3593: use devm_gpio_request_one
        leds: leds-gpio: use devm_gpio_request_one
        leds: lp3944: Fix return value
        ...
      e81d372f
    • L
      Merge tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore · 75e300c8
      Linus Torvalds 提交于
      Pull pstore update from Anton Vorontsov:
       "Here are just a few fixups for the pstore subsystem, nothing special
        this time"
      
      * tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore:
        pstore/ftrace: Adjust for ftrace_ops->func prototype change
        pstore/ram: Fix bounds checks for mem_size, record_size, console_size and ftrace_size
        pstore/ram: Fix undefined usage of rounddown_pow_of_two(0)
        pstore/ram: Fixup section annotations
      75e300c8
    • L
      Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · c13e69b2
      Linus Torvalds 提交于
      Pull libata updates from Jeff Garzik:
      
       - More ACPI fixes
      
       - ata_piix: cosmetic code movement, re-enable MS Virtual PC support
      
       - generic platform driver improvements; use common code
      
       - pata_cs5536: add quirk for broken udma
      
       - printk prettiness (dev_printk becomes dev_info, etc.)
      
       - sata_promise: fix hardreset lockdep error
      
       - minor cleanups from Sergei Shtylyov
      
       - minor, automated cleanups from Wei Yongjun
      
       - fix null ptr deref bug, in sysfs API
      
      * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (37 commits)
        sata_dwc_460ex: remove file exec bit (chmod 0755 -> 0644)
        [libata] fix Null pointer dereference on disk error
        ahci: convert ata_link_printk() to ata_link_warn()
        pata_imx: convert ata_dev_printk() to ata_dev_info()
        ARM: ep93xx: convert ata_<foo>_printk() to ata_<foo>_<level>()
        ahci_platform: make structs static
        Revert "pata_octeon_cf: perform host detach, removal on exit"
        Revert "libata: check SATA_SETTINGS log with HW Feature Ctrl"
        pata_of_platform: fix compile error
        libata: use pci_get_drvdata() helper
        pata_octeon_cf: perform host detach, removal on exit
        sata_highbank: utilize common ata_platform_remove_one()
        pata_palmld: utilize common ata_platform_remove_one()
        pata_platform: remove unused remove function
        pata_platform: utilize common ata_platform_remove_one()
        pata_of_platform: utilize common ata_platform_remove_one()
        pata_mpc52xx: utilize common ata_platform_remove_one()
        pata_ixp4xx_cf: utilize common ata_platform_remove_one()
        ahci_platform: utilize common ata_platform_remove_one()
        libata: implement ata_platform_remove_one()
        ...
      c13e69b2
    • L
      Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze · c5258190
      Linus Torvalds 提交于
      Pull microblaze update from Michal Simek:
       "The main change is UAPI for Microblaze."
      
      * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: signal: Declare do_notify_resume
        microblaze: lib: Add lib function declarations
        microblaze: lib: Remove helper macros
        microblaze: Add static qualifiers
        microblaze: Wire-up new system call kcmp
        microblaze: Fix intc_enable_or_unmask function
        microblaze: Do not initialized regs->r1 twice in ELF_PLAT_INIT
        microblaze: Remove passing the second arg to schedule_tail
        UAPI: (Scripted) Disintegrate arch/microblaze/include/asm
        microblaze: uaccess.h: Fix timerfd syscall
        microblaze: Remove BIP from childregs
      c5258190
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 1ed55eac
      Linus Torvalds 提交于
      Pull crypto update from Herbert Xu:
      
       - Added aesni/avx/x86_64 implementations for camellia.
      
       - Optimised AVX code for cast5/serpent/twofish/cast6.
      
       - Fixed vmac bug with unaligned input.
      
       - Allow compression algorithms in FIPS mode.
      
       - Optimised crc32c implementation for Intel.
      
       - Misc fixes.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (32 commits)
        crypto: caam - Updated SEC-4.0 device tree binding for ERA information.
        crypto: testmgr - remove superfluous initializers for xts(aes)
        crypto: testmgr - allow compression algs in fips mode
        crypto: testmgr - add larger crc32c test vector to test FPU path in crc32c_intel
        crypto: testmgr - clean alg_test_null entries in alg_test_descs[]
        crypto: testmgr - remove fips_allowed flag from camellia-aesni null-tests
        crypto: cast5/cast6 - move lookup tables to shared module
        padata: use __this_cpu_read per-cpu helper
        crypto: s5p-sss - Fix compilation error
        crypto: picoxcell - Add terminating entry for platform_device_id table
        crypto: omap-aes - select BLKCIPHER2
        crypto: camellia - add AES-NI/AVX/x86_64 assembler implementation of camellia cipher
        crypto: camellia-x86_64 - share common functions and move structures and function definitions to header file
        crypto: tcrypt - add async speed test for camellia cipher
        crypto: tegra-aes - fix error-valued pointer dereference
        crypto: tegra - fix missing unlock on error case
        crypto: cast5/avx - avoid using temporary stack buffers
        crypto: serpent/avx - avoid using temporary stack buffers
        crypto: twofish/avx - avoid using temporary stack buffers
        crypto: cast6/avx - avoid using temporary stack buffers
        ...
      1ed55eac
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw · 08242bc2
      Linus Torvalds 提交于
      Pull GFS2 updates from Steven Whitehouse:
       "The main feature this time is the new Orlov allocator and the patches
        leading up to it which allow us to allocate new inodes from their own
        allocation context, rather than borrowing that of their parent
        directory.  It is this change which then allows us to choose a
        different location for subdirectories when required.  This works
        exactly as per the ext3 implementation from the users point of view.
      
        In addition to that, we've got a speed up in gfs2_rbm_from_block()
        from Bob Peterson, three locking related improvements from Dave
        Teigland plus a selection of smaller bug fixes and clean ups."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
        GFS2: Set gl_object during inode create
        GFS2: add error check while allocating new inodes
        GFS2: don't reference inode's glock during block allocation trace
        GFS2: remove redundant lvb pointer
        GFS2: only use lvb on glocks that need it
        GFS2: skip dlm_unlock calls in unmount
        GFS2: Fix one RG corner case
        GFS2: Eliminate redundant buffer_head manipulation in gfs2_unlink_inode
        GFS2: Use dirty_inode in gfs2_dir_add
        GFS2: Fix truncation of journaled data files
        GFS2: Add Orlov allocator
        GFS2: Use proper allocation context for new inodes
        GFS2: Add test for resource group congestion status
        GFS2: Rename glops go_xmote_th to go_sync
        GFS2: Speed up gfs2_rbm_from_block
        GFS2: Review bug traps in glops.c
      08242bc2
    • L
      Revert "x86, mm: Include the entire kernel memory map in trampoline_pgd" · be354f40
      Linus Torvalds 提交于
      This reverts commit 53b87cf0.
      
      It causes odd bootup problems on x86-64.  Markus Trippelsdorf gets a
      repeatable oops, and I see a non-repeatable oops (or constant stream of
      messages that scroll off too quickly to read) that seems to go away with
      this commit reverted.
      
      So we don't know exactly what is wrong with the commit, but it's
      definitely problematic, and worth reverting sooner rather than later.
      Bisected-by: NMarkus Trippelsdorf <markus@trippelsdorf.de>
      Cc: H Peter Anvin <hpa@zytor.com>
      Cc: Jan Beulich <jbeulich@suse.com>
      Cc: Matt Fleming <matt.fleming@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      be354f40
  3. 15 12月, 2012 11 次提交
    • L
      Merge tag 'disintegrate-x86-20121214' of git://git.infradead.org/users/dhowells/linux-headers · 7a280cf5
      Linus Torvalds 提交于
      Pull x86 UAPI disintegration from David Howells.
      
      This is the scripted disintegration of the uapi headers for x86, now
      that most of the x86 updates for 3.8 are hopefully merged.
      
      * tag 'disintegrate-x86-20121214' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: (Scripted) Disintegrate arch/x86/include/asm
      7a280cf5
    • L
      Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6 · 4939e27d
      Linus Torvalds 提交于
      Pull another devicetree update from Grant Likely:
       "Here's a couple more devicetree changes that I missed in the first
        pull by putting the tag in the wrong place.
      
        Two minor devicetree fixups for v3.8.  Addition of dummy inlines and
        constification of node argument to of_parse_phandle_with_args()."
      
      * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        of: *node argument to of_parse_phandle_with_args should be const
        of/i2c: add dummy inline functions for when CONFIG_OF_I2C(_MODULE) isn't defined
      4939e27d
    • L
      Merge tag 'mvebu' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · c2714334
      Linus Torvalds 提交于
      Pull ARM SoC updates for Marvell mvebu/kirkwood from Olof Johansson:
       "This is a branch with updates for Marvell's mvebu/kirkwood platforms.
        They came in late-ish, and were heavily interdependent such that it
        didn't make sense to split them up across the cross-platform topic
        branches.  So here they are (for the second release in a row) in a
        branch on their own."
      
      * tag 'mvebu' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (88 commits)
        arm: l2x0: add aurora related properties to OF binding
        arm: mvebu: add Aurora L2 Cache Controller to the DT
        arm: mvebu: add L2 cache support
        dma: mv_xor: fix error handling path
        dma: mv_xor: fix error checking of irq_of_parse_and_map()
        dma: mv_xor: use request_irq() instead of devm_request_irq()
        dma: mv_xor: clear the window override control registers
        arm: mvebu: fix address decoding armada_cfg_base() function
        ARM: mvebu: update defconfig with I2C and RTC support
        ARM: mvebu: Add SATA support for OpenBlocks AX3-4
        ARM: mvebu: Add support for the RTC in OpenBlocks AX3-4
        ARM: mvebu: Add support for I2C on OpenBlocks AX3-4
        ARM: mvebu: Add support for I2C controllers in Armada 370/XP
        arm: mvebu: Add hardware I/O Coherency support
        arm: plat-orion: Add coherency attribute when setup mbus target
        arm: dma mapping: Export a dma ops function arm_dma_set_mask
        arm: mvebu: Add SMP support for Armada XP
        arm: mm: Add support for PJ4B cpu and init routines
        arm: mvebu: Add IPI support via doorbells
        arm: mvebu: Add initial support for power managmement service unit
        ...
      c2714334
    • L
      Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 0beb5878
      Linus Torvalds 提交于
      Pull ARM SoC device-tree updates, take 2, from Olof Johansson:
       "This branch contains device-tree updates for the SPEAr platform.  They
        had dependencies on earlier branches from this merge window, which is
        why they were broken out in a separate branch."
      
      * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: SPEAr3xx: Shirq: Move shirq controller out of plat/
        ARM: SPEAr320: DT: Add SPEAr 320 HMI board support
        ARM: SPEAr3xx: DT: add shirq node for interrupt multiplexor
        ARM: SPEAr3xx: shirq: simplify and move the shared irq multiplexor to DT
        ARM: SPEAr1310: Fix AUXDATA for compact flash controller
        ARM: SPEAr13xx: Remove fields not required for ssp controller
        ARM: SPEAr1310: Move 1310 specific misc register into machine specific files
        ARM: SPEAr: DT: Update device nodes
        ARM: SPEAr: DT: add uart state to fix warning
        ARM: SPEAr: DT: Modify DT bindings for STMMAC
        ARM: SPEAr: DT: Fix existing DT support
        ARM: SPEAr: DT: Update partition info for MTD devices
        ARM: SPEAr: DT: Update pinctrl list
        ARM: SPEAr13xx: DT: Add spics gpio controller nodes
      0beb5878
    • L
      Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6a57d104
      Linus Torvalds 提交于
      Pull ARM Soc updates, take 2, from Olof Johansson:
       "This is the second batch of SoC updates for the 3.8 merge window,
        containing parts that had dependencies on earlier branches such that
        we couldn't include them with the first branch.
      
        These are general updates for Samsung Exynos, Renesas/shmobile and a
        topic branch that adds SMP support to Altera's socfpga platform."
      
      Fix up conflicts mostly as per Olof.
      
      * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: EXYNOS: Clock settings for SATA and SATA PHY
        ARM: EXYNOS: Add ARM down clock support
        ARM: EXYNOS: Fix i2c suspend/resume for legacy controller
        ARM: EXYNOS: Add aliases for i2c controller
        ARM: EXYNOS: Setup legacy i2c controller interrupts
        sh: clkfwk: fixup unsed variable warning
        Revert "ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode"
        Revert "ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode"
        Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode"
        ARM: highbank: use common debug_ll_io_init
        ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
        ARM: shmobile: sh7372: remove fsidivx clock
        ARM: socfpga: mark secondary_trampoline as cpuinit
        socfpga: map uart into virtual address space so that early_printk() works
        ARM: socfpga: fix build break for allyesconfig
        ARM: socfpga: Enable SMP for socfpga
        ARM: EXYNOS: Add dp clock support for EXYNOS5
        ARM: SAMSUNG: call clk_get_rate for debugfs rate files
        ARM: SAMSUNG: add clock_tree debugfs file in clock
      6a57d104
    • D
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · cebfa85e
      Linus Torvalds 提交于
      Pull MIPS updates from Ralf Baechle:
       "The MIPS bits for 3.8.  This also includes a bunch fixes that were
        sitting in the linux-mips.org git tree for a long time.  This pull
        request contains updates to several OCTEON drivers and the board
        support code for BCM47XX, BCM63XX, XLP, XLR, XLS, lantiq, Loongson1B,
        updates to the SSB bus support, MIPS kexec code and adds support for
        kdump.
      
        When pulling this, there are two expected merge conflicts in
        include/linux/bcma/bcma_driver_chipcommon.h which are trivial to
        resolve, just remove the conflict markers and keep both alternatives."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (90 commits)
        MIPS: PMC-Sierra Yosemite: Remove support.
        VIDEO: Newport Fix console crashes
        MIPS: wrppmc: Fix build of PCI code.
        MIPS: IP22/IP28: Fix build of EISA code.
        MIPS: RB532: Fix build of prom code.
        MIPS: PowerTV: Fix build.
        MIPS: IP27: Correct fucked grammar in ops-bridge.c
        MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
        MIPS: Fix potencial corruption
        MIPS: Fix for warning from FPU emulation code
        MIPS: Handle COP3 Unusable exception as COP1X for FP emulation
        MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
        MIPS: MT: Fix build with CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
        MIPS: Remove unused smvp.h
        MIPS/EDAC: Improve OCTEON EDAC support.
        MIPS: OCTEON: Add definitions for OCTEON memory contoller registers.
        MIPS: OCTEON: Add OCTEON family definitions to octeon-model.h
        ata: pata_octeon_cf: Use correct byte order for DMA in when built little-endian.
        MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.
        MIPS: Remove usage of CEVT_R4K_LIB config option.
        ...
      cebfa85e
    • O
      ARM: arm-soc: Merge branch 'next/smp' into next/soc2 · c91321e8
      Olof Johansson 提交于
      Merging in the smp-on-socfpga branch into soc2 since the topics are similar
      and it's a short branch in the first place.
      
      * next/smp:
        ARM: socfpga: mark secondary_trampoline as cpuinit
        socfpga: map uart into virtual address space so that early_printk() works
        ARM: socfpga: fix build break for allyesconfig
        ARM: socfpga: Enable SMP for socfpga
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      c91321e8
    • L
      Merge branch 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d42b3a29
      Linus Torvalds 提交于
      Pull x86 EFI update from Peter Anvin:
       "EFI tree, from Matt Fleming.  Most of the patches are the new efivarfs
        filesystem by Matt Garrett & co.  The balance are support for EFI
        wallclock in the absence of a hardware-specific driver, and various
        fixes and cleanups."
      
      * 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
        efivarfs: Make efivarfs_fill_super() static
        x86, efi: Check table header length in efi_bgrt_init()
        efivarfs: Use query_variable_info() to limit kmalloc()
        efivarfs: Fix return value of efivarfs_file_write()
        efivarfs: Return a consistent error when efivarfs_get_inode() fails
        efivarfs: Make 'datasize' unsigned long
        efivarfs: Add unique magic number
        efivarfs: Replace magic number with sizeof(attributes)
        efivarfs: Return an error if we fail to read a variable
        efi: Clarify GUID length calculations
        efivarfs: Implement exclusive access for {get,set}_variable
        efivarfs: efivarfs_fill_super() ensure we clean up correctly on error
        efivarfs: efivarfs_fill_super() ensure we free our temporary name
        efivarfs: efivarfs_fill_super() fix inode reference counts
        efivarfs: efivarfs_create() ensure we drop our reference on inode on error
        efivarfs: efivarfs_file_read ensure we free data in error paths
        x86-64/efi: Use EFI to deal with platform wall clock (again)
        x86/kernel: remove tboot 1:1 page table creation code
        x86, efi: 1:1 pagetable mapping for virtual EFI calls
        x86, mm: Include the entire kernel memory map in trampoline_pgd
        ...
      d42b3a29
    • L
      Merge branch 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 18dd0bf2
      Linus Torvalds 提交于
      Pull x86 ACPI update from Peter Anvin:
       "This is a patchset which didn't make the last merge window.  It adds a
        debugging capability to feed ACPI tables via the initramfs.
      
        On a grander scope, it formalizes using the initramfs protocol for
        feeding arbitrary blobs which need to be accessed early to the kernel:
        they are fed first in the initramfs blob (lots of bootloaders can
        concatenate this at boot time, others can use a single file) in an
        uncompressed cpio archive using filenames starting with "kernel/".
      
        The ACPI maintainers requested that this patchset be fed via the x86
        tree rather than the ACPI tree as the footprint in the general x86
        code is much bigger than in the ACPI code proper."
      
      * 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        X86 ACPI: Use #ifdef not #if for CONFIG_X86 check
        ACPI: Fix build when disabled
        ACPI: Document ACPI table overriding via initrd
        ACPI: Create acpi_table_taint() function to avoid code duplication
        ACPI: Implement physical address table override
        ACPI: Store valid ACPI tables passed via early initrd in reserved memblock areas
        x86, acpi: Introduce x86 arch specific arch_reserve_mem_area() for e820 handling
        lib: Add early cpio decoder
      18dd0bf2
    • L
      Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2d9c8b5d
      Linus Torvalds 提交于
      Pull x86 RAS update from Ingo Molnar:
       "Rework all config variables used throughout the MCA code and collect
        them together into a mca_config struct.  This keeps them tightly and
        neatly packed together instead of spilled all over the place.
      
        Then, convert those which are used as booleans into real booleans and
        save some space.  These bits are exposed via
           /sys/devices/system/machinecheck/machinecheck*/"
      
      * 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, MCA: Finish mca_config conversion
        x86, MCA: Convert the next three variables batch
        x86, MCA: Convert rip_msr, mce_bootlog, monarch_timeout
        x86, MCA: Convert dont_log_ce, banks and tolerant
        drivers/base: Add a DEVICE_BOOL_ATTR macro
      2d9c8b5d
  4. 14 12月, 2012 13 次提交
    • L
      Revert "sched: Update_cfs_shares at period edge" · 17bc14b7
      Linus Torvalds 提交于
      This reverts commit f269ae04.
      
      It turns out it causes a very noticeable interactivity regression with
      CONFIG_SCHED_AUTOGROUP (test-case: "make -j32" of the kernel in a
      terminal window, while scrolling in a browser - the autogrouping means
      that the two end up in separate cgroups, and the browser should be
      smooth as silk despite the high load).
      
      Says Paul Turner:
       "It seems that the update-throttling on the wake-side is reducing the
        interactive tasks' ability to preempt.  While I suspect the right
        longer term answer here is force these updates only in the
        cross-cgroup case; this is less trivial.  For this release I believe
        the right answer is either going to be a revert or restore the updates
        on the enqueue-side."
      Reported-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Bisected-by: NMike Galbraith <efault@gmx.de>
      Acked-by: NPaul Turner <pjt@google.com>
      Acked-by: NIngo Molnar <mingo@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      17bc14b7
    • J
      72d5f2da
    • X
      [libata] fix Null pointer dereference on disk error · 26cd4d65
      Xiaotian Feng 提交于
      Following oops were observed when disk error happened:
      
      [ 4272.896937] sd 0:0:0:0: [sda] Unhandled error code
      [ 4272.896939] sd 0:0:0:0: [sda] Result: hostbyte=DID_BAD_TARGET driverbyte=DRIVER_OK
      [ 4272.896942] sd 0:0:0:0: [sda] CDB: Read(10): 28 00 00 5a de a7 00 00 08 00
      [ 4272.896951] end_request: I/O error, dev sda, sector 5955239
      [ 4291.574947] BUG: unable to handle kernel NULL pointer dereference at (null)
      [ 4291.658305] IP: [] ahci_activity_show+0x1/0x40
      [ 4291.730090] PGD 76dbbc067 PUD 6c4fba067 PMD 0
      [ 4291.783408] Oops: 0000 [#1] SMP
      [ 4291.822100] last sysfs file: /sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/sw_activity
      [ 4291.934235] CPU 9
      [ 4291.958301] Pid: 27942, comm: hwinfo ......
      
      ata_scsi_find_dev could return NULL, so ata_scsi_activity_{show,store} should check if atadev is NULL.
      Signed-off-by: NXiaotian Feng <dannyfeng@tencent.com>
      Cc: James Bottomley <JBottomley@Parallels.com>
      Cc: stable@kernel.org
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      26cd4d65
    • W
      ahci: convert ata_link_printk() to ata_link_warn() · 39f80acb
      Wei Yongjun 提交于
      Using ata_link_warn() instead of ata_link_printk().
      Signed-off-by: NWei Yongjun <yongjun_wei@trendmicro.com.cn>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      39f80acb
    • W
      pata_imx: convert ata_dev_printk() to ata_dev_info() · 22c8be31
      Wei Yongjun 提交于
      Using ata_dev_info() instead of ata_dev_printk().
      Signed-off-by: NWei Yongjun <yongjun_wei@trendmicro.com.cn>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      22c8be31
    • W
      ARM: ep93xx: convert ata_<foo>_printk() to ata_<foo>_<level>() · 99da09fc
      Wei Yongjun 提交于
      Using ata_<foo>_<level>() instead of ata_<foo>_printk().
      Signed-off-by: NWei Yongjun <yongjun_wei@trendmicro.com.cn>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      99da09fc
    • B
      ahci_platform: make structs static · 071d3ad3
      Brian Norris 提交于
      These structs are used only for ahci_platform.c, so they should be
      static. Thanks to Fengguang for the (automated) suggestion.
      Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
      Cc: Fengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      071d3ad3
    • J
      Revert "pata_octeon_cf: perform host detach, removal on exit" · 11ace0c1
      Jeff Garzik 提交于
      This reverts commit 1645bf1b.
      
      Brian Norris writes:
        > David Daney writes:
      
        > I can seem to find it.  Without knowing what that does, I would be inclined
        > to NACK the whole thing.
      
        A NACK is probably the right thing. I was mostly converting a few
        other drivers which used some simple, common patterns to use my new
        common code, but this driver was missing it altogether. It looks like
        there may be bigger issues, though, as you point out.
      
        > This patch is likely to be incomplete as the driver is also missing the
        > module_exit() things.
        >
        > It might be simpler to just make the driver "bool" instead of "tristate" in
        > the Kconfig.
      
        As noted earlier, I don't have much interest in this driver. I agree
        that there are some other issues with the driver; I think it leaks
        memory if it is ever allowed to unload, for one. Feel free to submit
        an alternative patch to prevent this driver from being built as a
        module.
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      11ace0c1
    • J
      Revert "libata: check SATA_SETTINGS log with HW Feature Ctrl" · 8349e5ae
      Jeff Garzik 提交于
      This reverts commit de90cd71.
      
      Shane Huang writes:
      
        Please suspend this patch because I just received two new
        DevSlp drives but found word 78 bit 5 is _not_ set.
      
        I'm checking with the drive vendor whether he gave me
        the wrong information. If bit 5 is not the necessary and
        sufficient condition, I will implement another patch to
        replace ata_device->sata_settings into ->devslp_timing.
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      8349e5ae
    • L
      Merge tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6 · 7313264b
      Linus Torvalds 提交于
      Pull battery subsystem updates from Anton Vorontsov:
       "Highlights:
      
         - Two new drivers from Pali Rohár and N900 hackers: rx51_battery and
           bq2415x_charger.  The drivers are a part of a solution to replace
           the proprietary Nokia BME stack
      
         - Power supply core now registers devices with a thermal cooling
           subsystem, so we can now automatically throttle charging.  Thanks
           to Ramakrishna Pallala!
      
         - Device tree support for ab8500 and max8925_power drivers
      
         - Random fixups and enhancements for a bunch of drivers."
      
      * tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6: (22 commits)
        max8925_power: Add support for device-tree initialization
        ab8500: Add devicetree support for chargalg
        ab8500: Add devicetree support for charger
        ab8500: Add devicetree support for btemp
        ab8500: Add devicetree support for fuelgauge
        twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_*
        jz4740-battery: Use devm_request_and_ioremap
        jz4740-battery: Use devm_kzalloc
        bq27x00_battery: Fixup nominal available capacity reporting
        bq2415x_charger: Fix style issues
        bq2415x_charger: Add Kconfig/Makefile entries
        power_supply: Add bq2415x charger driver
        power_supply: Add new Nokia RX-51 (N900) power supply battery driver
        max17042_battery: Fix missing verify_model_lock() return value check
        ds2782_battery: Fix signedness bug in ds278x_read_reg16()
        lp8788-charger: Fix ADC channel names
        lp8788-charger: Fix wrong ADC conversion
        lp8788-charger: Use consumer device name on setting IIO channels
        power_supply: Register power supply for thermal cooling device
        power_supply: Add support for CHARGE_CONTROL_* attributes
        ...
      7313264b
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · d8c532c4
      Linus Torvalds 提交于
      Pull media updates from Mauro Carvalho Chehab:
      
       - Missing MAINTAINERS entries were added for several drivers
      
       - Adds V4L2 support for DMABUF handling, allowing zero-copy buffer
         sharing between V4L2 devices and GPU
      
       - Got rid of all warnings when compiling with W=1 on x86
      
       - Add a new driver for Exynos hardware (s3c-camif)
      
       - Several bug fixes, cleanups and driver improvements
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (243 commits)
        [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
        [media] omap3isp: Prepare/unprepare clocks before/after enable/disable
        [media] omap3isp: preview: Add support for 8-bit formats at the sink pad
        [media] omap3isp: Replace printk with dev_*
        [media] omap3isp: Find source pad from external entity
        [media] omap3isp: Configure CSI-2 phy based on platform data
        [media] omap3isp: Add PHY routing configuration
        [media] omap3isp: Add CSI configuration registers from control block to ISP resources
        [media] omap3isp: Remove unneeded module memory address definitions
        [media] omap3isp: Use monotonic timestamps for statistics buffers
        [media] uvcvideo: Fix control value clamping for unsigned integer controls
        [media] uvcvideo: Mark first output terminal as default video node
        [media] uvcvideo: Add VIDIOC_[GS]_PRIORITY support
        [media] uvcvideo: Return -ENOTTY for unsupported ioctls
        [media] uvcvideo: Set device_caps in VIDIOC_QUERYCAP
        [media] uvcvideo: Don't fail when an unsupported format is requested
        [media] uvcvideo: Return -EACCES when trying to access a read/write-only control
        [media] uvcvideo: Set error_idx properly for extended controls API failures
        [media] rtl28xxu: add NOXON DAB/DAB+ USB dongle rev 2
        [media] fc2580: write some registers conditionally
        ...
      d8c532c4
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · e777d192
      Linus Torvalds 提交于
      Pull first round of SCSI updates from James Bottomley:
       "This patch set includes two large new drivers: mpt3sas (for the next
        gen fusion SAS hardware) and csiostor a FCoE offload driver for the
        Chelsio converged network cards (this includes some net changes which
        I've OK'd with DaveM).
      
        The rest of the patch is driver updates (qla2xxx, lpfc, hptiop,
        be2iscsi) plus a few assorted updates and bug fixes.
      
        We also have a Power Management rework in the Upper Layer Drivers
        preparatory to doing ACPI zero power optical devices, but the actual
        enabler is still being worked on.
      
        Signed-off-by: James Bottomley <JBottomley@Parallels.com>"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (72 commits)
        [SCSI] mpt3sas: add new driver supporting 12GB SAS
        [SCSI] scsi_transport_sas: add 12GB definitions for mpt3sas
        [SCSI] miscdevice: Adding support for MPT3SAS_MINOR(222)
        [SCSI] csiostor: remove unneeded memset()
        [SCSI] csiostor: Fix sparse warnings.
        [SCSI] qla2xxx: Display that driver is operating in legacy interrupt mode.
        [SCSI] qla2xxx: Dont clear drv active on iospace config failure.
        [SCSI] qla2xxx: Fix typo in qla2xxx driver.
        [SCSI] qla2xxx: Update ql2xextended_error_logging parameter description with new option.
        [SCSI] qla2xxx: Parameterize the link speed of hba rather than fcport.
        [SCSI] qla2xxx: Add 16Gb/s case to get port speed capability.
        [SCSI] qla2xxx: Move marking fcport online ahead of setting iiDMA speed.
        [SCSI] qla2xxx: Add acquiring of risc semaphore before doing ISP reset.
        [SCSI] qla2xxx: Ignore driver ack bit if corresponding presence bit is not set.
        [SCSI] qla2xxx: Fix typo in qla83xx_fw_dump function.
        [SCSI] qla2xxx: Add Gen3 PCIe speed 8GT/s to the log message.
        [SCSI] qla2xxx: Use correct Request-Q-Out register during bidirectional request processing
        [SCSI] qla2xxx: Move noisy Start scsi failed messages to verbose logging level.
        [SCSI] qla2xxx: Fix coccinelle warnings in qla2x00_relogin.
        [SCSI] qla2xxx: No fcport FC-4 type assignment in GA_NXT response.
        ...
      e777d192
    • L
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · f132c54e
      Linus Torvalds 提交于
      Pull infiniband upate from Roland Dreier:
       "First batch of InfiniBand/RDMA changes for the 3.8 merge window:
         - A good chunk of Bart Van Assche's SRP fixes
         - UAPI disintegration from David Howells
         - mlx4 support for "64-byte CQE" hardware feature from Or Gerlitz
         - Other miscellaneous fixes"
      
      Fix up trivial conflict in mellanox/mlx4 driver.
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (33 commits)
        RDMA/nes: Fix for crash when registering zero length MR for CQ
        RDMA/nes: Fix for terminate timer crash
        RDMA/nes: Fix for BUG_ON due to adding already-pending timer
        IB/srp: Allow SRP disconnect through sysfs
        srp_transport: Document sysfs attributes
        srp_transport: Simplify attribute initialization code
        srp_transport: Fix attribute registration
        IB/srp: Document sysfs attributes
        IB/srp: send disconnect request without waiting for CM timewait exit
        IB/srp: destroy and recreate QP and CQs when reconnecting
        IB/srp: Eliminate state SRP_TARGET_DEAD
        IB/srp: Introduce the helper function srp_remove_target()
        IB/srp: Suppress superfluous error messages
        IB/srp: Process all error completions
        IB/srp: Introduce srp_handle_qp_err()
        IB/srp: Simplify SCSI error handling
        IB/srp: Keep processing commands during host removal
        IB/srp: Eliminate state SRP_TARGET_CONNECTING
        IB/srp: Increase block layer timeout
        RDMA/cm: Change return value from find_gid_port()
        ...
      f132c54e