Skip to content
Commits on Mar 26, 2009
  1. @torvalds

    Merge branch 'for-linus' of git://…

    torvalds committed
    * 'for-linus' of git://
      slob: fix lockup in slob_free()
      slub: use get_track()
      slub: rename calculate_min_partial() to set_min_partial()
      slub: add min_partial sysfs tunable
      slub: move min_partial to struct kmem_cache
      SLUB: Fix default slab order for big object sizes
      SLUB: Do not pass 8k objects through to the page allocator
      SLUB: Introduce and use SLUB_MAX_SIZE and SLUB_PAGE_SHIFT constants
      slob: clean up the code
      SLUB: Use ->objsize from struct kmem_cache_cpu in slab_free()
  2. @torvalds

    Merge branch 'for-linus' of git://…

    torvalds committed
    * 'for-linus' of git://
      m68k: irq_node.handler() should return irqreturn_t
      m68k: section mismatch fixes: Atari SCSI
      m68k: section mismatch fixes: DMAsound for Atari
      MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository
      m68k: mac - Add SWIM floppy support
      m68k: mac - Add a new entry in mac_model to identify the floppy controller type.
      m68k: Add install target
  3. @torvalds

    Merge branch 'bkl-removal' of git://

    torvalds committed
    * 'bkl-removal' of git://
      Rationalize fasync return values
      Move FASYNC bit handling to f_op->fasync()
      Use f_lock to protect f_flags
      Rename struct file->f_ep_lock
  4. @torvalds

    Merge branch 'header-fixes-for-linus' of git://…

    torvalds committed
    * 'header-fixes-for-linus' of git:// (50 commits)
      x86: headers cleanup - setup.h
      emu101k1.h: fix duplicate include of <linux/types.h>
      compiler-gcc4: conditionalize #error on __KERNEL__
      remove __KERNEL_STRICT_NAMES
      make netfilter use strict integer types
      make drm headers use strict integer types
      make MTD headers use strict integer types
      make most exported headers use strict integer types
      make exported headers use strict posix types
      unconditionally include asm/types.h from linux/types.h
      make linux/types.h as assembly safe
      Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
      headers_check fix cleanup: linux/reiserfs_fs.h
      headers_check fix cleanup: linux/nubus.h
      headers_check fix cleanup: linux/coda_psdev.h
      headers_check fix: x86, setup.h
      headers_check fix: x86, prctl.h
      headers_check fix: linux/reinserfs_fs.h
      headers_check fix: linux/socket.h
      headers_check fix: linux/nubus.h
    Manually fix trivial conflicts in:
  5. @torvalds

    Merge branch 'irq-for-linus' of git://…

    torvalds committed
    * 'irq-for-linus' of git:// (32 commits)
      x86: disable __do_IRQ support
      sparseirq, powerpc/cell: fix unused variable warning in interrupt.c
      genirq: deprecate obsolete typedefs and defines
      genirq: deprecate __do_IRQ
      genirq: add doc to struct irqaction
      genirq: use kzalloc instead of explicit zero initialization
      genirq: make irqreturn_t an enum
      genirq: remove redundant if condition
      genirq: remove unused hw_irq_controller typedef
      irq: export remove_irq() and setup_irq() symbols
      irq: match remove_irq() args with setup_irq()
      irq: add remove_irq() for freeing of setup_irq() irqs
      genirq: assert that irq handlers are indeed running in hardirq context
      irq: name 'p' variables a bit better
      irq: further clean up the free_irq() code flow
      irq: refactor and clean up the free_irq() code flow
      irq: clean up manage.c
      irq: use GFP_KERNEL for action allocation in request_irq()
      kernel/irq: fix sparse warning: make symbol static
      irq: optimize init_kstat_irqs/init_copy_kstat_irqs
  6. @torvalds

    Merge branch 'timers-for-linus' of git://…

    torvalds committed
    * 'timers-for-linus' of git:// (26 commits)
      posix timers: fix RLIMIT_CPU && fork()
      time: ntp: fix bug in ntp_update_offset() & do_adjtimex(), fix
      time: ntp: clean up second_overflow()
      time: ntp: simplify ntp_tick_adj calculations
      time: ntp: make 64-bit constants more robust
      time: ntp: refactor do_adjtimex() some more
      time: ntp: refactor do_adjtimex()
      time: ntp: fix bug in ntp_update_offset() & do_adjtimex()
      time: ntp: micro-optimize ntp_update_offset()
      time: ntp: simplify ntp_update_offset_fll()
      time: ntp: refactor and clean up ntp_update_offset()
      time: ntp: refactor up ntp_update_frequency()
      time: ntp: clean up ntp_update_frequency()
      time: ntp: simplify the MAX_TICKADJ_SCALED definition
      time: ntp: simplify the second_overflow() code flow
      time: ntp: clean up kernel/time/ntp.c
      x86: hpet: stop HPET_COUNTER when programming periodic mode
      x86: hpet: provide separate functions to stop and start the counter
      x86: hpet: print HPET registers during setup (if hpet=verbose is used)
      time: apply NTP frequency/tick changes immediately
  7. @torvalds

    Merge branch 'sched-for-linus' of git://…

    torvalds committed
    * 'sched-for-linus' of git:// (46 commits)
      sched: Add comments to find_busiest_group() function
      sched: Refactor the power savings balance code
      sched: Optimize the !power_savings_balance during fbg()
      sched: Create a helper function to calculate imbalance
      sched: Create helper to calculate small_imbalance in fbg()
      sched: Create a helper function to calculate sched_domain stats for fbg()
      sched: Define structure to store the sched_domain statistics for fbg()
      sched: Create a helper function to calculate sched_group stats for fbg()
      sched: Define structure to store the sched_group statistics for fbg()
      sched: Fix indentations in find_busiest_group() using gotos
      sched: Simple helper functions for find_busiest_group()
      sched: remove unused fields from struct rq
      sched: jiffies not printed per CPU
      sched: small optimisation of can_migrate_task()
      sched: fix typos in documentation
      sched: add avg_overlap decay
      x86, sched_clock(): mark variables read-mostly
      sched: optimize ttwu vs group scheduling
      sched: TIF_NEED_RESCHED -> need_reshed() cleanup
      sched: don't rebalance if attached on NULL domain
  8. @torvalds

    Merge branch 'for-linus' of git://

    torvalds committed
    * 'for-linus' of git:// (81 commits)
      [S390] remove duplicated #includes
      [S390] cpumask: use mm_cpumask() wrapper
      [S390] cpumask: Use accessors code.
      [S390] cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.
      [S390] cpumask: remove cpu_coregroup_map
      [S390] fix clock comparator save area usage
      [S390] Add hwcap flag for the etf3 enhancement facility
      [S390] Ensure that ipl panic notifier is called late.
      [S390] fix dfp elf hwcap/facility bit detection
      [S390] smp: perform initial cpu reset before starting a cpu
      [S390] smp: fix memory leak on __cpu_up
      [S390] ipl: Improve checking logic and remove switch defaults.
      [S390] s390dbf: Remove needless check for NULL pointer.
      [S390] s390dbf: Remove redundant initilizations.
      [S390] use kzfree()
      [S390] BUG to BUG_ON changes
      [S390] zfcpdump: Prevent zcore from beeing built as a kernel module.
      [S390] Use csum_partial in checksum.h
      [S390] cleanup lowcore.h
      [S390] eliminate ipl_device from lowcore
  9. @torvalds

    Merge branch 'for-2.6.30' of git://

    torvalds committed
    * 'for-2.6.30' of git://
      Get rid of pdflush_operation() in emergency sync and remount
      btrfs: get rid of current_is_pdflush() in btrfs_btree_balance_dirty
      Move the default_backing_dev_info out of readahead.c and into backing-dev.c
      block: Repeated lines in switching-sched.txt
      bsg: Remove bogus check against request_queue->max_sectors
      block: WARN in __blk_put_request() for potential bio leak
      loop: fix circular locking in loop_clr_fd()
      loop: support barrier writes
      bsg: add support for tail queuing
      cpqarray: enable bus mastering
      block: genhd.h cleanup patch
      block: add private bio_set for bio integrity allocations
      block: genhd.h comment needs updating
      block: get rid of unused blkdev_free_rq() define
      block: remove various blk_queue_*() setting functions in blk_init_queue_node()
      cciss: add BUILD_BUG_ON() for catching bad CommandList_struct alignment
      block: don't create bio_vec slabs of less than the inline number
      block: cleanup bio_alloc_bioset()
  10. @torvalds

    Merge git://

    torvalds committed
    * git://
      sparc64: Flush TLB before releasing pages.
  11. @torvalds

    Merge git://

    torvalds committed
    * git:// (1750 commits)
      ixgbe: Allow Priority Flow Control settings to survive a device reset
      net: core: remove unneeded include in net/core/utils.c.
      e1000e: update version number
      e1000e: fix close interrupt race
      e1000e: fix loss of multicast packets
      e1000e: commonize tx cleanup routine to match e1000 & igb
      netfilter: fix nf_logger name in ebt_ulog.
      netfilter: fix warning in ebt_ulog init function.
      netfilter: fix warning about invalid const usage
      e1000: fix close race with interrupt
      e1000: cleanup clean_tx_irq routine so that it completely cleans ring
      e1000: fix tx hang detect logic and address dma mapping issues
      bridge: bad error handling when adding invalid ether address
      bonding: select current active slave when enslaving device for mode tlb and alb
      gianfar: reallocate skb when headroom is not enough for fcb
      Bump release date to 25Mar2009 and version to 0.22
      r6040: Fix second PHY address
      qeth: fix wait_event_timeout handling
      qeth: check for completion of a running recovery
      qeth: unregister MAC addresses during recovery.
    Manually fixed up conflicts in:
  12. @torvalds

    Merge git://…

    torvalds committed
    * git://
      [WATCHDOG] i6300esb.c: start locking
      [WATCHDOG] i6300esb.c: convert to platform device driver
      [WATCHDOG] wdt.c: remove #ifdef CONFIG_WDT_501
      [WATCHDOG] Fix io.h & uaccess.h includes.
      [WATCHDOG] More coding-style and trivial clean-up
      [WATCHDOG] struct file_operations should be const
      [WATCHDOG] cpwd.c: Coding style - Clean-up
      [WATCHDOG] hpwdt.c: Add new HP BMC controller. 
      [PATCH 13/13] drivers/watchdog: use USB API functions rather than constants
      [WATCHDOG] orion5x_wdt: fix compile issue by providing tclk as platform data
      [WATCHDOG] rc32434_wdt: make sure watchdog is not running at startup
      [WATCHDOG] rc32434_wdt: add spin_locking
      [WATCHDOG] rc32434_wdt: add shutdown method
      [WATCHDOG] rc32434_wdt: add timeout module parameter
      [WATCHDOG] rc32434_wdt: clean-up driver
      [WATCHDOG] davinci: convert to ioremap() + io[read|write]
      [WATCHDOG] w83697ug: add error checking
      [WATCHDOG] cpwd.c & riowd.c - unlocked_ioctl
  13. @torvalds

    Merge branch 'kvm-updates/2.6.30' of git://…

    torvalds committed
    * 'kvm-updates/2.6.30' of git:// (113 commits)
      KVM: VMX: Don't allow uninhibited access to EFER on i386
      KVM: Correct deassign device ioctl to IOW
      KVM: ppc: e500: Fix the bug that KVM is unstable in SMP
      KVM: ppc: e500: Fix the bug that mas0 update to wrong value when read TLB entry
      KVM: Fix missing smp tlb flush in invlpg
      KVM: Get support IRQ routing entry counts
      KVM: fix sparse warnings: Should it be static?
      KVM: fix sparse warnings: context imbalance
      KVM: is_long_mode() should check for EFER.LMA
      KVM: VMX: Update necessary state when guest enters long mode
      KVM: ia64: Fix the build errors due to lack of macros related to MSI.
      ia64: Move the macro definitions related to MSI to one header file.
      KVM: fix kvm_vm_ioctl_deassign_device
      KVM: ppc: Add emulation of E500 register mmucsr0
      KVM: Report IRQ injection status for MSI delivered interrupts
      KVM: MMU: Fix another largepage memory leak
      KVM: SVM: set accessed bit for VMCB segment selectors
      KVM: Report IRQ injection status to userspace.
      KVM: MMU: remove assertion in kvm_mmu_alloc_page
  14. @torvalds

    Merge branch 'for-linus' of git://…

    torvalds committed
    * 'for-linus' of git:// (30 commits)
      RDMA/cxgb3: Enforce required firmware
      IB/mlx4: Unregister IB device prior to CLOSE PORT command
      mlx4_core: Add link type autosensing
      mlx4_core: Don't perform SET_PORT command for Ethernet ports
      RDMA/nes: Handle MPA Reject message properly
      RDMA/nes: Improve use of PBLs
      RDMA/nes: Remove LLTX
      RDMA/nes: Inform hardware that asynchronous event has been handled
      RDMA/nes: Fix tmp_addr compilation warning
      RDMA/nes: Report correct vendor_id and vendor_part_id
      RDMA/nes: Update copyright to new legal entity and year
      RDMA/nes: Account for freed PBL after HW operation
      IB: Remove useless ibdev_is_alive() tests from sysfs code
      IB/sa_query: Fix AH leak due to update_sm_ah() race
      IB/mad: Fix ib_post_send_mad() returning 0 with no generate send comp
      IB/mad: initialize mad_agent_priv before putting on lists
      IB/mad: Fix null pointer dereference in local_completions()
      IB/mad: Fix RMPP header RRespTime manipulation
      IB/iser: Remove hard setting of path MTU
      mlx4_core: Add device IDs for MT25458 10GigE devices
  15. @torvalds

    Merge git://

    torvalds committed
    * git://
      [CIFS] Fix memory overwrite when saving nativeFileSystem field during mount
      [CIFS]  Rename compose_mount_options to cifs_compose_mount_options.
      [CIFS] work around bug in Samba server handling for posix open
      [CIFS] Use posix open on file open when server supports it
      cifs: fix buffer format byte on NT Rename/hardlink
      [CIFS] Add definitions for remoteably fsctl calls
      [CIFS] add extra null attr check
      [CIFS] fix build error
      [CIFS] reopen file via newer posix open protocol operation if available
      [CIFS] Add new nostrictsync cifs mount option to avoid slow SMB flush
      [CIFS] DFS no longer experimental
      [CIFS] Send SMB flush in cifs_fsync
  16. @Alan-Cox @torvalds

    dontdiff: Fix asm exclude

    Alan-Cox committed with torvalds
    Now that the headers are in arch/foo/include/asm we don't want to exclude
    them when preparing diff files.
    Closes-bug: 12921
    Signed-off-by: Alan Cox <>
    Signed-off-by: Linus Torvalds <>
  17. @jankara @torvalds

    ext3: Avoid starting a transaction in writepage when not necessary

    jankara committed with torvalds
    We don't have to start a transaction in writepage() when all the blocks
    are a properly allocated. Even in ordered mode either the data has been
    written via write() and they are thus already added to transaction's list
    or the data was written via mmap and then it's random in which transaction
    they get written anyway.
    This should help VM to pageout dirty memory without blocking on transaction
    Signed-off-by: Jan Kara <>
    Signed-off-by: Linus Torvalds <>
  18. @davem330

    Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

    davem330 committed
  19. @geertu

    m68k: irq_node.handler() should return irqreturn_t

    geertu committed
    commit b5dc784 ("m68k: introduce irq
    controller") reverted the return type of struct irq_node.handler() from
    irqreturn_t to int. Change it back to irqreturn_t, else it will give a
    compiler warning when irqreturn_t is turned into an enum in the near future:
    | arch/m68k/kernel/ints.c:231: warning: assignment from incompatible pointer type
    Signed-off-by: Geert Uytterhoeven <>
  20. @geertu

    m68k: section mismatch fixes: Atari SCSI

    Michael Schmitz committed with geertu
    add __init annotations to probe routines
    Signed-off-by: Michael Schmitz <>
    Signed-off-by: Geert Uytterhoeven <>
  21. @geertu

    m68k: section mismatch fixes: DMAsound for Atari

    Michael Schmitz committed with geertu
    add __initdata to driver presets struct
    Signed-off-By: Michael Schmitz <>
    Signed-off-by: Geert Uytterhoeven <>
  22. @geertu

    MAINTAINERS: Replace dead link to m68k CVS repository by link to new …

    geertu committed
    …git repository
    CVS is dead, long live git!
    Signed-off-by: Geert Uytterhoeven <>
  23. @geertu

    m68k: mac - Add SWIM floppy support

    Laurent Vivier committed with geertu
    It allows to read data from a floppy, but not to write to, and to eject the
    floppy (useful on our Mac without eject button).
    Signed-off-by: Laurent Vivier <>
    Signed-off-by: Geert Uytterhoeven <>
  24. @geertu

    m68k: mac - Add a new entry in mac_model to identify the floppy contr…

    Laurent Vivier committed with geertu
    …oller type.
    This patch adds a field "floppy_type" which can take the following values:
    MAC_FLOPPY_IWM for an IWM based mac
    MAC_FLOPPY_SWIM_ADDR1 for a SWIM based mac with controller at VIA1 + 0x1E000
    MAC_FLOPPY_SWIM_ADDR2 for a SWIM based mac with controller at VIA1 + 0x16000
    MAC_FLOPPY_IOP for an IOP based mac
    MAC_FLOPPY_AV for an AV based mac
    Signed-off-by: Laurent Vivier <>
    Signed-off-by: Geert Uytterhoeven <>
  25. @geertu

    m68k: Add install target

    Laurent Vivier committed with geertu
    This patch enables the use of "make install" on m68k architecture
    to copy kernel to /boot.
    Signed-off-by: Laurent Vivier <>
    Signed-off-by: Geert Uytterhoeven <>
  26. @torvalds

    Merge branch 'upstream-linus' of git://…

    torvalds committed
    * 'upstream-linus' of git:// (35 commits)
      [libata] Improve timeout handling
      [libata] Drain data on errors
      pata_sc1200: Activate secondary channel
      pata_artop: Serializing support
      [libata] ahci: correct enclosure LED state save
      [libata] More robust parsing for IDENTIFY DEVICE multi_count field
      sata_mv: fix LED blinking for SoC+NCQ
      sata_mv: optimize IRQ coalescing for 8-port chips
      sata_mv: implement IRQ coalescing (v2)
      sata_mv: cosmetic preparations for IRQ coalescing
      pata-rb532-cf: platform_get_irq() fix ignored failure
      pata_efar: fix *dma_mask
      pata_radisys: fix mwdma_mask to exclude mwdma0
      [libata] convert drivers to use ata.h mode mask defines
      include/linux/ata.h: add some more transfer masks
      ahci: Blacklist HP Compaq 6720s that spins off disks during ACPI power off
      [libata] sata_mv: Implement direct FIS transmission via mv_qc_issue_fis().
      [libata] Export ata_pio_queue_task() so that it can be used from sata_mv.
      [libata] sata_mv: Add a new mv_sff_check_status() function to sata_mv.
      [libata] sata_mv: Tighten up interrupt masking in mv_qc_issue()
  27. @torvalds

    Merge git://

    torvalds committed
    * git:// (97 commits)
      USB: qcserial: add device id for HP devices
      USB: isp1760: Add a delay before reading the SKIPMAP registers in isp1760-hcd.c
      USB: allow malformed LANGID descriptors
      USB: pxa27x_udc: typo fixes and code cleanups
      USB: gadget: gadget zero uses new suspend/resume hooks
      USB: gadget: composite device-level suspend/resume hooks
      USB: r8a66597-hcd: suspend/resume support
      USB: more u32 conversion after transfer_buffer_length and actual_length
      USB: Fix cp2101 USB serial device driver termios functions for console use
      USB: CP2101 New Device ID
      USB: ipaq: handle 4 endpoint devices
      USB: S3C: Move usb-control.h to platform include
      USB: ohci-hcd: Add ARCH_S3C24XX to the ohci-s3c2410.c glue
      USB: pedantic: spelling correction in comment for ch9.h
      USB: host: fix sparse warning: Using plain integer as NULL pointer
      USB: ohci-s3c2410: fix name of bus clock
      USB: ohci-s3c2410: remove <mach/hardware.h> include
      USB: serial: rename cp2101 driver to cp210x
      USB: CP2101 Reduce Error Logging
      USB: CP2101 Support AN205 baud rates
  28. @torvalds

    Merge git://…

    torvalds committed
    * git:// (61 commits)
      Dynamic debug: fix pr_fmt() build error
      Dynamic debug: allow simple quoting of words
      dynamic debug: update docs
      dynamic debug: combine dprintk and dynamic printk
      sysfs: fix some bin_vm_ops errors
      kobject: don't block for each kobject_uevent
      sysfs: only allow one scheduled removal callback per kobj
      Driver core: Fix device_move() vs. dpm list ordering, v2
      Driver core: some cleanup on drivers/base/sys.c
      Driver core: implement uevent suppress in kobject
      vcs: hook sysfs devices into object lifetime instead of "binding"
      driver core: fix passing platform_data
      driver core: move platform_data into platform_device
      sysfs: don't block indefinitely for unmapped files.
      driver core: move knode_bus into private structure
      driver core: move knode_driver into private structure
      driver core: move klist_children into private structure
      driver core: create a private portion of struct device
      driver core: remove polling for driver_probe_done(v5)
      sysfs: reference sysfs_dirent from sysfs inodes
    Fixed conflicts in drivers/sh/maple/maple.c manually
  29. @torvalds

    Merge git://

    torvalds committed
    * git:// (53 commits)
      ide: use try_to_identify() in ide_driveid_update()
      ide: clear drive IRQ after re-enabling local IRQs in ide_driveid_update()
      ide: sanitize SELECT_MASK() usage in ide_driveid_update()
      ide: classify device type in do_probe()
      ide: remove broken EXABYTENEST support
      ide: shorten timeout value in ide_driveid_update()
      ide: propagate AltStatus workarounds to ide_driveid_update()
      ide: fix kmalloc() failure handling in ide_driveid_update()
      mn10300: remove <asm/ide.h>
      frv: remove <asm/ide.h>
      ide: remove pciirq argument from ide_pci_setup_ports()
      ide: fix ->init_chipset method to return 'int' value
      ide: remove try_to_identify() wrapper
      ide: remove no longer needed IRQ auto-probing from try_to_identify() (v2)
      ide: remove no longer needed IRQ fallback code from hwif_init()
      amd74xx: remove no longer needed ->init_hwif method
      ide: remove no longer needed IDE_HFLAG[_FORCE]_LEGACY_IRQS
      ide: use ide_pci_is_in_compatibility_mode() in ide_pci_init_{one,two}()
      ide: use pci_get_legacy_ide_irq() in ide_pci_init_{one,two}()
      ide: handle IDE_HFLAG[_FORCE]_LEGACY_IRQS in ide_pci_init_{one,two}()
  30. @torvalds

    Merge git://

    torvalds committed
    * git:// (96 commits)
      sh: add support for SMSC Polaris platform
      sh: fix the HD64461 level-triggered interrupts handling
      sh: sh-rtc wakeup support
      sh: sh-rtc invalid time rework
      sh: sh-rtc carry interrupt rework
      sh: disallow kexec virtual entry
      sh: kexec jump: fix for ftrace.
      sh: kexec: Drop SR.BL bit toggling.
      sh: add kexec jump support
      sh: rework kexec segment code
      sh: simplify kexec vbr code
      sh: Flush only the needed range when unmapping a VMA.
      sh: Update debugfs ASID dumping for 16-bit ASID support.
      sh: tlb-pteaex: Kill off legacy PTEA updates.
      sh: Support for extended ASIDs on PTEAEX-capable SH-X3 cores.
      sh: sh7763rdp: Change IRQ number for sh_eth of sh7763rdp
      sh: espt-giga board support
      sh: dma: Make G2 DMA configurable.
      sh: dma: Make PVR2 DMA configurable.
      sh: Move IRQ multi definition of DMAC to defconfig
  31. @torvalds

    Merge git://

    torvalds committed
    * git://
      GFS2: Fix freeze issue
      Fix a minor bug in the previous patch
      GFS2: Clean up of glops.c
      GFS2: Fix locking bug in failed shared to exclusive conversion
      GFS2: Pagecache usage optimization on GFS2
      GFS2: fix sparse warning: Should it be static?
      GFS2: fix sparse warnings: constant is so big it is ...
      GFS2: Support quota/noquota mount arguments
      GFS2: Fix alignment issue and tidy gfs2_bitfit
      GFS2: Add a "demote a glock" interface to sysfs
      GFS2: Expose UUID via sysfs/uevent
      GFS2: Support generation of discard requests
      GFS2: Fix deadlock on journal flush
      GFS2: Fix error path ref counting for root inode
      GFS2: Remove unused field from glock
      GFS2: Merge lock_dlm module into GFS2
      GFS2: Remove "double" locking in quota
      GFS2: change gfs2_quota_scan into a shrinker
      GFS2: Bring back lvb-related stuff to lock_nolock to support quotas
      GFS2: Fix remount argument parsing
  32. @torvalds

    Merge git://…

    torvalds committed
    * git://
      avr32: remove duplicated #include
      avr32: fix out-of-range rjmp instruction on large kernels
      avr32: Fix out-of-range rcalls in large kernels
  33. @torvalds

    Merge branch 'for-linus' of git://…

    torvalds committed
    * 'for-linus' of git:// (430 commits)
      ALSA: hda - Add quirk for Acer Ferrari 5000
      ALSA: hda - Use cached calls to get widget caps and pin caps
      ALSA: hda - Don't create empty/single-item input source
      ALSA: hda - Fix the wrong pin-cap check in patch_realtek.c
      ALSA: hda - Cache pin-cap values
      ALSA: hda - Avoid output amp manipulation to digital mic pins
      ALSA: hda - Add function id to proc output
      ALSA: pcm - Safer boundary checks
      ALSA: hda - Detect digital-mic inputs on ALC663 / ALC272
      ALSA: sound/ali5451: typo: s/resouces/resources/
      ALSA: hda - Don't show the current connection for power widgets
      ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.c
      ASoC: Declare Headset as Mic and Headphone widgets for SDP3430
      ASoC: OMAP: N810: Add more jack functions
      ASoC: OMAP: N810: Mark not connected input pins
      ASoC: Add FLL support for WM8400
      ALSA: hda - Don't reset stream at each prepare callback
      ALSA: hda - Don't reset BDL unnecessarily
      ALSA: pcm - Fix delta calculation at boundary overlap
      ALSA: pcm - Reset invalid position even without debug option
  34. @torvalds

    Merge git://

    torvalds committed
    * git:// (29 commits)
      crypto: sha512-s390 - Add missing block size
      hwrng: timeriomem - Breaks an allyesconfig build on s390:
      nlattr: Fix build error with NET off
      crypto: testmgr - add zlib test
      crypto: zlib - New zlib crypto module, using pcomp
      crypto: testmgr - Add support for the pcomp interface
      crypto: compress - Add pcomp interface
      netlink: Move netlink attribute parsing support to lib
      crypto: Fix dead links
      hwrng: timeriomem - New driver
      crypto: chainiv - Use kcrypto_wq instead of keventd_wq
      crypto: cryptd - Per-CPU thread implementation based on kcrypto_wq
      crypto: api - Use dedicated workqueue for crypto subsystem
      crypto: testmgr - Test skciphers with no IVs
      crypto: aead - Avoid infinite loop when nivaead fails selftest
      crypto: skcipher - Avoid infinite loop when cipher fails selftest
      crypto: api - Fix crypto_alloc_tfm/create_create_tfm return convention
      crypto: api - crypto_alg_mod_lookup either tested or untested
      crypto: amcc - Add crypt4xx driver
      crypto: ansi_cprng - Add maintainer
  35. @torvalds

    Merge branch 'next' of git://…

    torvalds committed
    * 'next' of git:// (35 commits)
      [CPUFREQ] Prevent p4-clockmod from auto-binding to the ondemand governor.
      [CPUFREQ] Make cpufreq-nforce2 less obnoxious
      [CPUFREQ] p4-clockmod reports wrong frequency.
      [CPUFREQ] powernow-k8: Use a common exit path.
      [CPUFREQ] Change link order of x86 cpufreq modules
      [CPUFREQ] conservative: remove 10x from def_sampling_rate
      [CPUFREQ] conservative: fixup governor to function more like ondemand logic
      [CPUFREQ] conservative: fix dbs_cpufreq_notifier so freq is not locked
      [CPUFREQ] conservative: amend author's email address
      [CPUFREQ] Use swap() in longhaul.c
      [CPUFREQ] checkpatch cleanups for acpi-cpufreq
      [CPUFREQ] powernow-k8: Only print error message once, not per core.
      [CPUFREQ] ondemand/conservative: sanitize sampling_rate restrictions
      [CPUFREQ] ondemand/conservative: deprecate sampling_rate{min,max}
      [CPUFREQ] powernow-k8: Always compile powernow-k8 driver with ACPI support
      [CPUFREQ] Introduce /sys/devices/system/cpu/cpu*/cpufreq/cpuinfo_transition_latency
      [CPUFREQ] checkpatch cleanups for powernow-k8
      [CPUFREQ] checkpatch cleanups for ondemand governor.
      [CPUFREQ] checkpatch cleanups for powernow-k7
      [CPUFREQ] checkpatch cleanups for speedstep related drivers.
Something went wrong with that request. Please try again.