1. 01 Jun, 2012 8 commits
  2. 31 May, 2012 25 commits
    • Linus Torvalds's avatar
      Merge tag 'for-v3.5' of git://git.infradead.org/battery-2.6 · 76f901eb
      Linus Torvalds authored
      Pull battery updates from Anton Vorontsov:
       "A bunch of fixes for v3.5, nothing extraordinary."
      
      * tag 'for-v3.5' of git://git.infradead.org/battery-2.6: (27 commits)
        smb347-charger: Include missing <linux/err.h>
        smb347-charger: Clean up battery attributes
        max17042_battery: Add support for max17047/50 chip
        sbs-battery.c: Capacity attr = remaining relative capacity
        isp1704_charger: Use after free on probe error
        ds2781_battery: Use DS2781_PARAM_EEPROM_SIZE and DS2781_USER_EEPROM_SIZE
        power_supply: Fix a typo in BATTERY_DS2781 Kconfig entry
        charger-manager: Provide cm_notify_event function for in-kernel use
        charger-manager: Poll battery health in normal state
        smb347-charger: Convert to regmap API
        smb347-charger: Move IRQ enabling to the end of probe
        smb347-charger: Rename few functions to match better what they are doing
        smb347-charger: Convert to use module_i2c_driver()
        smb347_charger: Cleanup power supply registration code in probe
        ab8500: Clean up probe routines
        ab8500_fg: Harden platform data check
        ab8500_btemp: Harden platform data check
        ab8500_charger: Harden platform data check
        MAINTAINERS: Fix 'F' entry for the power supply class
        max17042_battery: Handle irq request failure case
        ...
      76f901eb
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · bd0e162d
      Linus Torvalds authored
      Pull two small kvm fixes from Avi Kivity:
       "A build fix for non-kvm archs and a transparent hugepage refcount
        bugfix on hosts with 4M pages."
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: Export asm-generic/kvm_para.h
        KVM: MMU: fix huge page adapted on non-PAE host
      bd0e162d
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 05455227
      Linus Torvalds authored
      Pull final round of SCSI updates from James Bottomley:
       "This is primarily another round of driver updates (bnx2fc, qla2xxx,
        qla4xxx) including the target mode driver for qla2xxx.  We've also got
        a couple of regression fixes (async scanning, broken this merge window
        and a fix to a long standing break in the scsi_wait_scan module)."
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (45 commits)
        [SCSI] fix scsi_wait_scan
        [SCSI] fix async probe regression
        [SCSI] be2iscsi: fix dma free size mismatch regression
        [SCSI] qla4xxx: Update driver version to 5.02.00-k17
        [SCSI] qla4xxx: Capture minidump for ISP82XX on firmware failure
        [SCSI] qla4xxx: Add change_queue_depth API support
        [SCSI] qla4xxx: Fix clear ddb mbx command failure issue.
        [SCSI] qla4xxx: Fix kernel panic during discovery logout.
        [SCSI] qla4xxx: Correct early completion of pending mbox.
        [SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs
        [SCSI] libfcoe: Add fcoe_sysfs
        [SCSI] bnx2fc: Allocate fcoe_ctlr with bnx2fc_interface, not as a member
        [SCSI] fcoe: Allocate fcoe_ctlr with fcoe_interface, not as a member
        [SCSI] Fix dm-multipath starvation when scsi host is busy
        [SCSI] ufs: fix potential NULL pointer dereferencing error in ufshcd_prove.
        [SCSI] qla2xxx: don't free pool that wasn't allocated
        [SCSI] mptfusion: unlock on error in mpt_config()
        [SCSI] tcm_qla2xxx: Add >= 24xx series fabric module for target-core
        [SCSI] qla2xxx: Add LLD target-mode infrastructure for >= 24xx series
        [SCSI] Revert "qla2xxx: During loopdown perform Diagnostic loopback."
        ...
      05455227
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 5b461209
      Linus Torvalds authored
      Pull follow-up block updates from Jens Axboe:
       "Includes the fix from Eric to resolve the infinite loop in looking up
        or creating an IO context for an exiting task.
      
        Also a bunch of mtip32xx patches.  Fairly trivial stuff.  It's fairly
        new though, but no point in keeping it out of the tree until 3.6 imho.
        I've thrown it through basic testing locally as well, works fine.  The
        one contentious part is the patch that Greg complained about (sysfs
        file with multiple values, should be a debugfs file), which is
        perfectly valid, but not a regression from what the file contains now.
        That will be fixed up separately."
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: avoid infinite loop in get_task_io_context()
        mtip32xx: Changes to sysfs entries
        mtip32xx: Convert macro definitions for flag bits to enum
        mtip32xx: minor performance tweak
        mtip32xx: Fix to support more than one sector in exec_drive_command()
        mtip32xx: Use plain spinlock for 'cmd_issue_lock'
        mtip32xx: Set block queue boundary variables
        mtip32xx: Fix to handle TFE for PIO(IOCTL/internal) commands
        mtip32xx: Change HDIO_GET_IDENTITY to return stored data
        mtip32xx: Set custom timeouts for PIO commands
        mtip32xx: fix clearing an incorrect register in mtip_init_port
      5b461209
    • Eric Dumazet's avatar
      tty: add lockdep annotations · fde86d31
      Eric Dumazet authored
      tty_lock_pair() do the right thing to avoid deadlocks, but should
      instruct LOCKDEP of this to avoid a splat.
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fde86d31
    • Trond Myklebust's avatar
      NFS: Ensure that setattr and getattr wait for O_DIRECT write completion · 1d59d61f
      Trond Myklebust authored
      Use the same mechanism as the block devices are using, but move the
      helper functions from fs/direct-io.c into fs/inode.c to remove the
      dependency on CONFIG_BLOCK.
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Fred Isaman <iisaman@netapp.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1d59d61f
    • Linus Torvalds's avatar
      Merge tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras · 2d117403
      Linus Torvalds authored
      Pull mce cleanup from Tony Luck:
       "One more mce cleanup before the 3.5 merge window closes"
      
      * tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
        x86/mce: Cleanup timer mess
      2d117403
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 8ee78c6f
      Linus Torvalds authored
      Pull s390 patches from Heiko Carstens:
       "A couple of s390 patches for the 3.5 merge window.  Just a collection
        of bug fixes and cleanups."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/uaccess: fix access_ok compile warnings
        s390/cmpxchg: select HAVE_CMPXCHG_LOCAL option
        s390/cmpxchg: fix sign extension bugs
        s390/cmpxchg: fix 1 and 2 byte memory accesses
        s390/cmpxchg: fix compile warnings specific to s390
        s390/cmpxchg: add missing memory barrier to cmpxchg64
        s390/cpu: remove cpu "capabilities" sysfs attribute
        s390/kernel: Fix smp_call_ipl_cpu() for offline CPUs
        s390/kernel: Introduce memcpy_absolute() function
        s390/headers: replace __s390x__ with CONFIG_64BIT where possible
        s390/headers: remove #ifdef __KERNEL__ from not exported headers
        s390/irq: split irq stats for cpu-measurement alert facilities
        s390/kexec: Move early_pgm_check_handler() to text section
        s390/kdump: Use real mode for PSW restart and kexec
        s390/kdump: Account /sys/kernel/kexec_crash_size changes in OS info
        s390/kernel: Remove OS info init function call and diag 308 for kdump
      8ee78c6f
    • Linus Torvalds's avatar
      Merge tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 · aac422af
      Linus Torvalds authored
      Pull misc parisc updates from James Bottomley:
       "This is a couple of updates to complete our fixes and one to fix a
        compile failure caused during the merge window.  Additionally, we now
        switch to the generic strncopy_from_user."
      
      * tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
        [PARISC] update parisc to use generic strncpy_from_user()
        [PARISC] Fix parisc compile failure after smp: Add task_struct argument to __cpu_up()
        [PARISC] fix TLB fault path on PA2.0 narrow systems
        [PARISC] fix boot failure on 32-bit systems caused by branch stubs placed before .text
      aac422af
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0c6be871
      Linus Torvalds authored
      Pull additional x86 fixes from Peter Anvin.
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, amd, xen: Avoid NULL pointer paravirt references
        x86, mtrr: Fix a type overflow in range_to_mtrr func
        x86, realmode: Unbreak the ia64 build of drivers/acpi/sleep.c
        x86/mm/pat: Improve scaling of pat_pagerange_is_ram()
        x86: hpet: Fix copy-and-paste mistake in earlier change
        x86/mce: Fix 32-bit build
        x86/bitops: Move BIT_64() for a wider use
      0c6be871
    • Linus Torvalds's avatar
      Merge tag 'devel-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6a445c7f
      Linus Torvalds authored
      Pull late-merged development and first fixes for arm-soc from Olof Johansson:
       "This branch contains a few development patches for Samsung and
        Versatile Express that were submitted to arm-soc near the beginning of
        the merge window.  We picked them up with the agreement that they
        would need to sit in linux-next for a while, and now they have.
      
        There are also two fixes:
         - One long-standing build breakage on ixp4xx due to missing gpiolib
           dependencies.
         - The other is for some gpio device tree changes needed on lpc32xx."
      
      * tag 'devel-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: LPC32xx: Adjust dts files to gpio dt binding
        ixp4xx: fix compilation by adding gpiolib support
        ARM: vexpress: Remove twice included header files
        ARM: vexpress: Device Tree updates
        ARM: EXYNOS: Support suspend and resume for EXYNOS5250
        ARM: EXYNOS: Add Clock register list for save and restore
        ARM: EXYNOS: Add PMU table for EXYNOS5250
        ARM: EXYNOS: Rename of function for pm.c
        ARM: EXYNOS: Remove GIC save & restore function
        ARM: dts: Add node for interrupt combiner controller on EXYNOS5250
        ARM: S3C24XX: add support for second irq set of S3C2416
        ARM: S3C64XX: use timekeeping wrapper on cpuidle
        ARM: S3C64XX: declare the states with the new api on cpuidle
        ARM: S3C64XX: Hook up carrier class modules on Cragganmore
        ARM: S3C64XX: Initial hookup for Bells module on Cragganmore
      6a445c7f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · f737c770
      Linus Torvalds authored
      Pull Sparc updates from David S. Miller:
      
       1) Remove the idiotic situation wherein Leon was a special case in all
          of the TLB/cache handling code.
      
          The worst side effect of this bogosity is that you couldn't build a
          kernel with Leon support enabled (to get better build coverage), and
          test boot it on a non-LEON cpu.
      
          Leon is, in all core respects, programatically identical to the
          32-bit SRMMU.  Except that they put the TLB registers in a different
          alternate address space location.
      
          Through code patching (for fast paths) and run time checks, this
          issue is now a thing of the past.
      
          From Sam Ravnborg.
      
       2) There was a mis-merge of arch/sparc/Kconfig for one of the
          clockevents changes that went in, causing 32-bit sparc to start
          failing to build.
      
          I merged in your tree to get those clockevents changes (and added a
          note to the merge commit) then added Stephen Rothwell's fix for the
          merge error.
      
       3) Software quad floating point emulation was not working properly on
          more recent Niagara chips, because the way the situation is reported
          by the cpu has changed.
      
          Nobody noticed because gcc emits calls to software emulation
          routines in glibc.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: (25 commits)
        sparc: fix sparc64 build due to leon.h inclusion
        sparc32: remove unused variable in head_32.S
        sparc32,leon: fix leon bootup
        sparc32: Export leon_dma_ops to modules.
        sparc32: support leon + sun in dma_make_coherent()
        sparc32,leon: always support leon in ioport
        sparc32,leon: always include leon_pmc in build
        sparc32: refactor cpu_idle()
        sparc32: srmmu_probe now knows about leon too
        sparc32: drop LEON hack for ASI_M_MMUREGS
        sparc32: introduce run-time patching of srmmu access functions
        sparc32: introduce support for run-time patching for all shared assembler code
        sparc32,leon: fix section mismatch warning
        sparc32,leon: always include leon_smp + leon_mm in build
        sparc32,leon: always include leon_kernel in build
        sparc32,leon: clean up leon.h
        sparc32: handle leon in cpu.c
        sparc32: handle leon in irq_32.c
        sparc32: add support for run-time patching of leon/sun single instructions
        sparc32: introduce sparc32_start_kernel called from head_32.S
        ...
      f737c770
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 13199a08
      Linus Torvalds authored
      Pull networking changes from David S. Miller:
      
       1) Fix IPSEC header length calculation for transport mode in ESP.  The
          issue is whether to do the calculation before or after alignment.
          Fix from Benjamin Poirier.
      
       2) Fix regression in IPV6 IPSEC fragment length calculations, from Gao
          Feng.  This is another transport vs tunnel mode issue.
      
       3) Handle AF_UNSPEC connect()s properly in L2TP to avoid OOPSes.  Fix
          from James Chapman.
      
       4) Fix USB ASIX driver's reception of full sized VLAN packets, from
          Eric Dumazet.
      
       5) Allow drop monitor (and, more generically, all generic netlink
          protocols) to be automatically loaded as a module.  From Neil
          Horman.
      
      Fix up trivial conflict in Documentation/feature-removal-schedule.txt
      due to new entries added next to each other at the end. As usual.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits)
        net/smsc911x: Repair broken failure paths
        virtio-net: remove useless disable on freeze
        netdevice: Update netif_dbg for CONFIG_DYNAMIC_DEBUG
        drop_monitor: Add module alias to enable automatic module loading
        genetlink: Build a generic netlink family module alias
        net: add MODULE_ALIAS_NET_PF_PROTO_NAME
        r6040: Do a Proper deinit at errorpath and also when driver unloads (calling r6040_remove_one)
        r6040: disable pci device if the subsequent calls (after pci_enable_device) fails
        skb: avoid unnecessary reallocations in __skb_cow
        net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens
        asix: allow full size 8021Q frames to be received
        rds_rdma: don't assume infiniband device is PCI
        l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case
        mac80211: fix ADDBA declined after suspend with wowlan
        wlcore: fix undefined symbols when CONFIG_PM is not defined
        mac80211: fix flag check for QoS NOACK frames
        ath9k_hw: apply internal regulator settings on AR933x
        ath9k_hw: update AR933x initvals to fix issues with high power devices
        ath9k: fix a use-after-free-bug when ath_tx_setup_buffer() fails
        ath9k: stop rx dma before stopping tx
        ...
      13199a08
    • Eric Dumazet's avatar
      block: avoid infinite loop in get_task_io_context() · 3c9c708c
      Eric Dumazet authored
      Calling get_task_io_context() on a exiting task which isn't %current can
      loop forever. This triggers at boot time on my dev machine.
      
      BUG: soft lockup - CPU#3 stuck for 22s ! [mountall.1603]
      
      Fix this by making create_task_io_context() returns -EBUSY in this case
      to break the loop.
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Tejun Heo <tj@kernel.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Alan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      3c9c708c
    • James Bottomley's avatar
    • Asai Thambi S P's avatar
      mtip32xx: Changes to sysfs entries · b77874c9
      Asai Thambi S P authored
      * Formatted the output of 'registers' entry
      * Added "Commands in Q' to output of 'registers' entry
      * Added a new entry 'flags'
      Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      b77874c9
    • Asai Thambi S P's avatar
      mtip32xx: Convert macro definitions for flag bits to enum · 8ce80093
      Asai Thambi S P authored
      Convert macro definitions for flags bits to enum
      Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      8ce80093
    • Asai Thambi S P's avatar
      mtip32xx: minor performance tweak · 377b8fc6
      Asai Thambi S P authored
      When checking for command completions if the register value is zero, proceed
      to next register.
      Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      377b8fc6
    • Asai Thambi S P's avatar
      mtip32xx: Fix to support more than one sector in exec_drive_command() · e602878f
      Asai Thambi S P authored
      Fix to support more than one sector in exec_drive_command().
      Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      e602878f
    • Asai Thambi S P's avatar
      mtip32xx: Use plain spinlock for 'cmd_issue_lock' · 0a07ab22
      Asai Thambi S P authored
      'cmd_issue_lock' is for only acquiring a free slot, and it is not used
      in interrupt context. So replaced irq version with non-irq version of spinlock.
      Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      0a07ab22
    • Asai Thambi S P's avatar
      mtip32xx: Set block queue boundary variables · 6c8ab698
      Asai Thambi S P authored
      Set the following block queue boundary variables
      	* max_hw_sectors
      	* max_segment_size
      Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
      
      Removed setting of q->nr_requests.
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      6c8ab698
    • Asai Thambi S P's avatar
      mtip32xx: Fix to handle TFE for PIO(IOCTL/internal) commands · d02e1f0a
      Asai Thambi S P authored
      If a PIO (IOCTL/internal) command resulted in TFE, signal the wait event or break out of polling.
      Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      d02e1f0a
    • Asai Thambi S P's avatar
      mtip32xx: Change HDIO_GET_IDENTITY to return stored data · 971890f2
      Asai Thambi S P authored
      For the ioctl command HDIO_GET_IDENTITY, return the stored copy of IDENTIFY
      DATA instead of sending the command to the device - similar to libata.
      Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      971890f2
    • Asai Thambi S P's avatar
      mtip32xx: Set custom timeouts for PIO commands · 2df7aa96
      Asai Thambi S P authored
      This change sets custom timeouts depending on PIO command.
      Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      2df7aa96
    • Asai Thambi S P's avatar
      mtip32xx: fix clearing an incorrect register in mtip_init_port · 6bb688c0
      Asai Thambi S P authored
      Fix clearing an incorrect register in mtip_init_port
      Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      6bb688c0
  3. 30 May, 2012 7 commits