1. 21 May, 2010 34 commits
    • NeilBrown's avatar
      Merge commit '3ff195b0' into for-linus · 19fdb9ee
      NeilBrown authored
      Conflicts:
      	drivers/md/md.c
      
      - Resolved conflict in md_update_sb
      - Added extra 'NULL' arg to new instance of sysfs_get_dirent.
      Signed-off-by: default avatarNeilBrown <neilb@suse.de>
      19fdb9ee
    • Eric W. Biederman's avatar
      sysfs: Implement sysfs tagged directory support. · 3ff195b0
      Eric W. Biederman authored
      The problem.  When implementing a network namespace I need to be able
      to have multiple network devices with the same name.  Currently this
      is a problem for /sys/class/net/*, /sys/devices/virtual/net/*, and
      potentially a few other directories of the form /sys/ ... /net/*.
      
      What this patch does is to add an additional tag field to the
      sysfs dirent structure.  For directories that should show different
      contents depending on the context such as /sys/class/net/, and
      /sys/devices/virtual/net/ this tag field is used to specify the
      context in which those directories should be visible.  Effectively
      this is the same as creating multiple distinct directories with
      the same name but internally to sysfs the result is nicer.
      
      I am calling the concept of a single directory that looks like multiple
      directories all at the same path in the filesystem tagged directories.
      
      For the networking namespace the set of directories whose contents I need
      to filter with tags can depend on the presence or absence of hotplug
      hardware or which modules are currently loaded.  Which means I need
      a simple race free way to setup those directories as tagged.
      
      To achieve a reace free design all tagged directories are created
      and managed by sysfs itself.
      
      Users of this interface:
      - define a type in the sysfs_tag_type enumeration.
      - call sysfs_register_ns_types with the type and it's operations
      - sysfs_exit_ns when an individual tag is no longer valid
      
      - Implement mount_ns() which returns the ns of the calling process
        so we can attach it to a sysfs superblock.
      - Implement ktype.namespace() which returns the ns of a syfs kobject.
      
      Everything else is left up to sysfs and the driver layer.
      
      For the network namespace mount_ns and namespace() are essentially
      one line functions, and look to remain that.
      
      Tags are currently represented a const void * pointers as that is
      both generic, prevides enough information for equality comparisons,
      and is trivial to create for current users, as it is just the
      existing namespace pointer.
      
      The work needed in sysfs is more extensive.  At each directory
      or symlink creating I need to check if the directory it is being
      created in is a tagged directory and if so generate the appropriate
      tag to place on the sysfs_dirent.  Likewise at each symlink or
      directory removal I need to check if the sysfs directory it is
      being removed from is a tagged directory and if so figure out
      which tag goes along with the name I am deleting.
      
      Currently only directories which hold kobjects, and
      symlinks are supported.  There is not enough information
      in the current file attribute interfaces to give us anything
      to discriminate on which makes it useless, and there are
      no potential users which makes it an uninteresting problem
      to solve.
      Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: default avatarBenjamin Thery <benjamin.thery@bull.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      3ff195b0
    • Eric W. Biederman's avatar
      kobj: Add basic infrastructure for dealing with namespaces. · bc451f20
      Eric W. Biederman authored
      Move complete knowledge of namespaces into the kobject layer
      so we can use that information when reporting kobjects to
      userspace.
      Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      bc451f20
    • Eric W. Biederman's avatar
    • Eric W. Biederman's avatar
      sysfs: Basic support for multiple super blocks · 9e7fdd25
      Eric W. Biederman authored
      Add all of the necessary bioler plate to support
      multiple superblocks in sysfs.
      Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
      Acked-by: default avatarSerge Hallyn <serue@us.ibm.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      9e7fdd25
    • David Zeuthen's avatar
      generate "change" uevent for loop device · c3473c63
      David Zeuthen authored
      Recent udev versions probe loop devices for filesystems meaning that
      the /dev/disk hierarchy may contain useful entries such as
      
       $ ls -l /dev/disk/by-label/Fedora-12-x86_64-Live
       lrwxrwxrwx 1 root root 11 Mar 11 13:41 /dev/disk/by-label/Fedora-12-x86_64-Live -> ../../loop0
      
      Unfortunately, no "change" uevent is generated when the loop device is
      detached so the symlink persists. Additionally, no "change" uevent is
      guaranteed to be generated when attaching an fd or changing capacity.
      For example,  user space could open the loop device O_RDONLY (in fact,
      recent util-linux-ng does this) so udev's OPTIONS+="watch" machinery may
      not trigger the "change" uevent.
      
      This patch ensures that the "change" uevent is generated in all of
      these cases. As a result, the /dev/disk hierarchy works as expected
      for loop devices.
      Signed-off-by: default avatarDavid Zeuthen <davidz@redhat.com>
      Acked-by: default avatarKay Sievers <kay.sievers@vrfy.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      c3473c63
    • Hugh Daschbach's avatar
      Driver core: Protect device shutdown from hot unplug events. · 6245838f
      Hugh Daschbach authored
      While device_shutdown() walks through devices_kset to shutdown all
      devices, device unplug events may race to shutdown individual devices.
      Specifically, sd_shutdown(), on behalf of fc_starget_delete(), has
      been observed deleting devices during device_shutdown()'s list
      traversal.  So we factor out list_for_each_entry_safe_reverse(...) in
      favor of while (!list_empty(...)).
      Signed-off-by: default avatarHugh Daschbach <hdasch@broadcom.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      6245838f
    • Dmitry Torokhov's avatar
      firmware loader: do not allocate firmare id separately · e177123f
      Dmitry Torokhov authored
      fw_id has the same life time as firmware_priv so it makes sense to move
      it into firmware_priv structure instead of allocating separately.
      Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      e177123f
    • Dmitry Torokhov's avatar
      firmware loader: split out builtin firmware handling · bcb9bd18
      Dmitry Torokhov authored
      Split builtin firmware handling into separate functions to clean up the
      main body of code.
      Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      bcb9bd18
    • Dmitry Torokhov's avatar
      firmware loader: rely on driver core to create class attribute · 673fae90
      Dmitry Torokhov authored
      Do not create 'timeout' attribute manually, let driver core do it for us.
      This also ensures that attribute is cleaned up properly.
      Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      673fae90
    • Johannes Berg's avatar
      firmware class: export nowait to userspace · e9045f91
      Johannes Berg authored
      When we use request_firmware_nowait(), userspace may
      not want to answer negatively right away when for
      example it is answering from an initrd only, but
      with request_firmware() it has to in order to not
      delay the kernel boot until the request times out.
      
      This allows userspace to differentiate between the
      two in order to be able to reply negatively to async
      requests only when all filesystems have been mounted
      and have been checked for the requested firmware file.
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      Cc: Kay Sievers <kay.sievers@vrfy.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      e9045f91
    • Peter Zijlstra's avatar
      lockdep: Add novalidate class for dev->mutex conversion · 1704f47b
      Peter Zijlstra authored
      The conversion of device->sem to device->mutex resulted in lockdep
      warnings. Create a novalidate class for now until the driver folks
      come up with separate classes. That way we have at least the basic
      mutex debugging coverage.
      
      Add a checkpatch error so the usage is reserved for device->mutex.
      
      [ tglx: checkpatch and compile fix for LOCKDEP=n ]
      Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      1704f47b
    • Thomas Gleixner's avatar
      drivers/base: Convert dev->sem to mutex · 3142788b
      Thomas Gleixner authored
      The semaphore is semantically a mutex. Convert it to a real mutex and
      fix up a few places where code was relying on semaphore.h to be included
      by device.h, as well as the users of the trylock function, as that value
      is now reversed.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      3142788b
    • Kevin Hilman's avatar
      platform_bus: allow custom extensions to system PM methods · 190e8370
      Kevin Hilman authored
      When runtime PM for platform_bus was added, it allowed for platforms
      to customize the runtime PM methods since they are defined as weak
      symbols.
      
      This patch allows platforms to also extend the system PM methods with
      custom hooks so runtime PM and system PM extensions can be managed
      together by custom platform-specific code.
      Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
      Cc: Magnus Damm <damm@opensource.se>
      Cc: Rafael Wysocki <rjw@sisk.pl>
      Cc: Dmitry Torokhov <dtor@mail.ru>
      Cc: Eric Miao <eric.y.miao@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      190e8370
    • Peter Korsgaard's avatar
      devtmpfs: support !CONFIG_TMPFS · da5e4ef7
      Peter Korsgaard authored
      Make devtmpfs available on (embedded) configurations without SHMEM/TMPFS,
      using ramfs instead.
      
      Saves ~15KB.
      Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
      Acked-by: default avatarKay Sievers <kay.sievers@vrfy.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      da5e4ef7
    • Julia Lawall's avatar
      driver core: module.c: Use kasprintf · 1653268b
      Julia Lawall authored
      kasprintf combines kmalloc and sprintf, and takes care of the size
      calculation itself.
      
      The semantic patch that makes this change is as follows:
      (http://coccinelle.lip6.fr/)
      
      // <smpl>
      @@
      expression a,flag;
      expression list args;
      statement S;
      @@
      
        a =
      -  \(kmalloc\|kzalloc\)(...,flag)
      +  kasprintf(flag,args)
        <... when != a
        if (a == NULL || ...) S
        ...>
      - sprintf(a,args);
      // </smpl>
      Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      1653268b
    • Alan Stern's avatar
      Driver core: don't initialize wakeup flags · ffa15659
      Alan Stern authored
      This patch (as1351) removes an unnecessary and unwanted assignment
      from device_initialize().  The wakeup flags are set to 0 along with
      everything else when the device structure is allocated, so we don't
      need to do it again.  Furthermore, the subsystem might already have
      set these flags to their correct values; we don't want to override it.
      Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      ffa15659
    • Stefani Seibold's avatar
      driver-core: fix potential race condition in drivers/base/dd.c · fbb88fad
      Stefani Seibold authored
      This patch fix a potential race condition in the driver_bound() function
      in the file driver/base/dd.c.
      
      The broadcast of the BUS_NOTIFY_BOUND_DRIVER notifier should be done
      after adding the new device to the driver list. Otherwise notifier
      listener will fail if they use functions like usb_find_interface().
      
      The patch is against kernel 2.6.33. Please merge it.
      Signed-off-by: default avatarStefani Seibold <stefani@seibold.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      fbb88fad
    • Rafael J. Wysocki's avatar
      Driver core: Reduce the level of request_firmware() messages · 6f18ff91
      Rafael J. Wysocki authored
      The messages from _request_firmware() informing that firmware is
      being requested or built-in firmware is going to be used are printed
      at KERN_INFO, which produces lots of noise on systems with huge
      numbers of AMD CPUs.  Reduce the level of these messages to
      KERN_DEBUG to get rid of that noise.
      Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      6f18ff91
    • NeilBrown's avatar
      kref: remove kref_set · db1afffa
      NeilBrown authored
      Of the three uses of kref_set in the kernel:
      
       One really should be kref_put as the code is letting go of a
          reference,
       Two really should be kref_init because the kref is being
          initialised.
      
      This suggests that making kref_set available encourages bad code.
      So fix the three uses and remove kref_set completely.
      Signed-off-by: default avatarNeilBrown <neilb@suse.de>
      Acked-by: default avatarMimi Zohar <zohar@us.ibm.com>
      Acked-by: default avatarSerge Hallyn <serue@us.ibm.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      db1afffa
    • David Woodhouse's avatar
      firmware_class: fix memory leak - free allocated pages · dd336c55
      David Woodhouse authored
      fix memory leak introduced by the patch 6e03a201:
      firmware: speed up request_firmware()
      
      1. vfree won't release pages there were allocated explicitly and mapped
      using vmap. The memory has to be vunmap-ed and the pages needs
      to be freed explicitly
      
      2. page array is moved into the 'struct
      firmware' so that we can free it from release_firmware()
      and not only in fw_dev_release()
      
      The fix doesn't break the firmware load speed.
      
      Cc: Johannes Berg <johannes@sipsolutions.net>
      Cc: Ming Lei <tom.leiming@gmail.com>
      Cc: Catalin Marinas <catalin.marinas@arm.com>
      Singed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      dd336c55
    • Jan Beulich's avatar
      drivers/base/cpu.c: fix the output from /sys/devices/system/cpu/offline · cdc6e3d3
      Jan Beulich authored
      Without CONFIG_CPUMASK_OFFSTACK, simply inverting cpu_online_mask leads
      to CPUs beyond nr_cpu_ids to be displayed twice and CPUs not even
      possible to be displayed as offline.
      Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Cc: stable <stable@kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      cdc6e3d3
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · d7dbf4ff
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: (23 commits)
        nilfs2: disallow remount of snapshot from/to a regular mount
        nilfs2: use huge_encode_dev/huge_decode_dev
        nilfs2: update comment on deactivate_super at nilfs_get_sb
        nilfs2: replace MS_VERBOSE with MS_SILENT
        nilfs2: add missing initialization of s_mode
        nilfs2: fix misuse of open_bdev_exclusive/close_bdev_exclusive
        nilfs2: enlarge s_volume_name member in nilfs_super_block
        nilfs2: use checkpoint number instead of timestamp to select super block
        nilfs2: add missing endian conversion on super block magic number
        nilfs2: make nilfs_sc_*_ops static
        nilfs2: add kernel doc comments to persistent object allocator functions
        nilfs2: change sc_timer from a pointer to an embedded one in struct nilfs_sc_info
        nilfs2: remove nilfs_segctor_init() in segment.c
        nilfs2: insert checkpoint number in segment summary header
        nilfs2: add a print message after loading nilfs2
        nilfs2: cleanup multi kmem_cache_{create,destroy} code
        nilfs2: move out checksum routines to segment buffer code
        nilfs2: move pointer to super root block into logs
        nilfs2: change default of 'errors' mount option to 'remount-ro' mode
        nilfs2: Combine nilfs_btree_release_path() and nilfs_btree_free_path()
        ...
      d7dbf4ff
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 677abe49
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
        GFS2: Fix typo
        GFS2: stuck in inode wait, no glocks stuck
        GFS2: Eliminate useless err variable
        GFS2: Fix writing to non-page aligned gfs2_quota structures
        GFS2: Add some useful messages
        GFS2: fix quota state reporting
        GFS2: Various gfs2_logd improvements
        GFS2: glock livelock
        GFS2: Clean up stuffed file copying
        GFS2: docs update
        GFS2: Remove space from slab cache name
      677abe49
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · e90e4d92
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: fix ast ordering for user locks
        dlm: cleanup remove unused code
      e90e4d92
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · 05ec7dd8
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (154 commits)
        mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chips
        mtd: cfi_cmdset_0002: Fix MODULE_ALIAS and linkage for new 0701 commandset ID
        mtd: mxc_nand: Remove duplicate NAND_CMD_RESET case value
        mtd: update gfp/slab.h includes
        jffs2: Stop triggering block erases from jffs2_write_super()
        jffs2: Rename jffs2_erase_pending_trigger() to jffs2_dirty_trigger()
        jffs2: Use jffs2_garbage_collect_trigger() to trigger pending erases
        jffs2: Require jffs2_garbage_collect_trigger() to be called with lock held
        jffs2: Wake GC thread when there are blocks to be erased
        jffs2: Erase pending blocks in GC pass, avoid invalid -EIO return
        jffs2: Add 'work_done' return value from jffs2_erase_pending_blocks()
        mtd: mtdchar: Do not corrupt backing device of device node inode
        mtd/maps/pcmciamtd: Fix printk format for ssize_t in debug messages
        drivers/mtd: Use kmemdup
        mtd: cfi_cmdset_0002: Fix argument order in bootloc warning
        mtd: nand: add Toshiba TC58NVG0 device ID
        pcmciamtd: add another ID
        pcmciamtd: coding style cleanups
        pcmciamtd: fixing obvious errors
        mtd: chips: add SST39WF160x NOR-flashes
        ...
      
      Trivial conflicts due to dev_node removal in drivers/mtd/maps/pcmciamtd.c
      05ec7dd8
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 · c316ba3b
      Linus Torvalds authored
      * 'linux-next' of git://git.infradead.org/ubi-2.6:
        UBI: misc comment fixes
        UBI: fix s/then/than/ typos
        UBI: init even if MTD device cannot be attached, if built into kernel
        UBI: remove reboot notifier
      c316ba3b
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · 777cb1b5
      Linus Torvalds authored
      * 'linux-next' of git://git.infradead.org/ubifs-2.6:
        UBIFS: mark VFS SB RO too
      777cb1b5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 277a4ed1
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (54 commits)
        xfs: mark xfs_iomap_write_ helpers static
        xfs: clean up end index calculation in xfs_page_state_convert
        xfs: clean up mapping size calculation in __xfs_get_blocks
        xfs: clean up xfs_iomap_valid
        xfs: move I/O type flags into xfs_aops.c
        xfs: kill struct xfs_iomap
        xfs: report iomap_bn in block base
        xfs: report iomap_offset and iomap_bsize in block base
        xfs: remove iomap_delta
        xfs: remove iomap_target
        xfs: limit xfs_imap_to_bmap to a single mapping
        xfs: simplify buffer to transaction matching
        xfs: Make fiemap work in query mode.
        xfs: kill off l_sectbb_mask
        xfs: record log sector size rather than log2(that)
        xfs: remove dead XFS_LOUD_RECOVERY code
        xfs: removed unused XFS_QMOPT_ flags
        xfs: remove a few macro indirections in the quota code
        xfs: access quotainfo structure directly
        xfs: wait for direct I/O to complete in fsync and write_inode
        ...
      277a4ed1
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · 03e62303
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (47 commits)
        ocfs2: Silence a gcc warning.
        ocfs2: Don't retry xattr set in case value extension fails.
        ocfs2:dlm: avoid dlm->ast_lock lockres->spinlock dependency break
        ocfs2: Reset xattr value size after xa_cleanup_value_truncate().
        fs/ocfs2/dlm: Use kstrdup
        fs/ocfs2/dlm: Drop memory allocation cast
        Ocfs2: Optimize punching-hole code.
        Ocfs2: Make ocfs2_find_cpos_for_left_leaf() public.
        Ocfs2: Fix hole punching to correctly do CoW during cluster zeroing.
        Ocfs2: Optimize ocfs2 truncate to use ocfs2_remove_btree_range() instead.
        ocfs2: Block signals for mkdir/link/symlink/O_CREAT.
        ocfs2: Wrap signal blocking in void functions.
        ocfs2/dlm: Increase o2dlm lockres hash size
        ocfs2: Make ocfs2_extend_trans() really extend.
        ocfs2/trivial: Code cleanup for allocation reservation.
        ocfs2: make ocfs2_adjust_resv_from_alloc simple.
        ocfs2: Make nointr a default mount option
        ocfs2/dlm: Make o2dlm domain join/leave messages KERN_NOTICE
        o2net: log socket state changes
        ocfs2: print node # when tcp fails
        ...
      03e62303
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 33cf23b0
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (182 commits)
        [SCSI] aacraid: add an ifdef'd device delete case instead of taking the device offline
        [SCSI] aacraid: prohibit access to array container space
        [SCSI] aacraid: add support for handling ATA pass-through commands.
        [SCSI] aacraid: expose physical devices for models with newer firmware
        [SCSI] aacraid: respond automatically to volumes added by config tool
        [SCSI] fcoe: fix fcoe module ref counting
        [SCSI] libfcoe: FIP Keep-Alive messages for VPorts are sent with incorrect port_id and wwn
        [SCSI] libfcoe: Fix incorrect MAC address clearing
        [SCSI] fcoe: fix a circular locking issue with rtnl and sysfs mutex
        [SCSI] libfc: Move the port_id into lport
        [SCSI] fcoe: move link speed checking into its own routine
        [SCSI] libfc: Remove extra pointer check
        [SCSI] libfc: Remove unused fc_get_host_port_type
        [SCSI] fcoe: fixes wrong error exit in fcoe_create
        [SCSI] libfc: set seq_id for incoming sequence
        [SCSI] qla2xxx: Updates to ISP82xx support.
        [SCSI] qla2xxx: Optionally disable target reset.
        [SCSI] qla2xxx: ensure flash operation and host reset via sg_reset are mutually exclusive
        [SCSI] qla2xxx: Silence bogus warning by gcc for wrap and did.
        [SCSI] qla2xxx: T10 DIF support added.
        ...
      33cf23b0
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 7a9b1492
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
        USB: remove unused usb_buffer_alloc and usb_buffer_free macros
        usb: musb: update gfp/slab.h includes
        USB: ftdi_sio: fix legacy SIO-device header
        USB: kl5usb105: reimplement using generic framework
        USB: kl5usb105: minor clean ups
        USB: kl5usb105: fix memory leak
        USB: io_ti: use kfifo to implement write buffering
        USB: io_ti: remove unsused private counter
        USB: ti_usb: use kfifo to implement write buffering
        USB: ir-usb: fix incorrect write-buffer length
        USB: aircable: fix incorrect write-buffer length
        USB: safe_serial: straighten out read processing
        USB: safe_serial: reimplement read using generic framework
        USB: safe_serial: reimplement write using generic framework
        usb-storage: always print quirks
        USB: usb-storage: trivial debug improvements
        USB: oti6858: use port write fifo
        USB: oti6858: use kfifo to implement write buffering
        USB: cypress_m8: use kfifo to implement write buffering
        USB: cypress_m8: remove unused drain define
        ...
      
      Fix up conflicts (due to usb_buffer_alloc/free renaming) in
      	drivers/input/tablet/acecad.c
      	drivers/input/tablet/kbtab.c
      	drivers/input/tablet/wacom_sys.c
      	drivers/media/video/gspca/gspca.c
      	sound/usb/usbaudio.c
      7a9b1492
    • Stephen Rothwell's avatar
      sound: fixup for usb_buffer_alloc/free rename · 3d62e3fd
      Stephen Rothwell authored
      This is needed before the USB merge.
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3d62e3fd
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · f8965467
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
        qlcnic: adding co maintainer
        ixgbe: add support for active DA cables
        ixgbe: dcb, do not tag tc_prio_control frames
        ixgbe: fix ixgbe_tx_is_paused logic
        ixgbe: always enable vlan strip/insert when DCB is enabled
        ixgbe: remove some redundant code in setting FCoE FIP filter
        ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
        ixgbe: fix header len when unsplit packet overflows to data buffer
        ipv6: Never schedule DAD timer on dead address
        ipv6: Use POSTDAD state
        ipv6: Use state_lock to protect ifa state
        ipv6: Replace inet6_ifaddr->dead with state
        cxgb4: notify upper drivers if the device is already up when they load
        cxgb4: keep interrupts available when the ports are brought down
        cxgb4: fix initial addition of MAC address
        cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
        cnic: Convert cnic_local_flags to atomic ops.
        can: Fix SJA1000 command register writes on SMP systems
        bridge: fix build for CONFIG_SYSFS disabled
        ARCNET: Limit com20020 PCI ID matches for SOHARD cards
        ...
      
      Fix up various conflicts with pcmcia tree drivers/net/
      {pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
      wireless/orinoco/spectrum_cs.c} and feature removal
      (Documentation/feature-removal-schedule.txt).
      
      Also fix a non-content conflict due to pm_qos_requirement getting
      renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
      f8965467
  2. 20 May, 2010 6 commits