1. 01 May, 2007 26 commits
    • Jean Delvare's avatar
      i2c: Add i2c_new_probed_device() · 12b5053a
      Jean Delvare authored
      Add a new helper function to instantiate an i2c device. It is meant as a
      replacement for i2c_new_device() when you don't know for sure at which
      address your I2C/SMBus device lives. This happens frequently on TV
      adapters for example, you know there is a tuner chip on the bus, but
      depending on the exact board model and revision, it can live at different
      addresses. So, the new i2c_new_probed_device() function will probe the bus
      according to a list of addresses, and as soon as one of these addresses
      responds, it will call i2c_new_device() on that one address.
      
      This function will make it possible to port the old i2c drivers to the
      new model quickly.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      12b5053a
    • Jean Delvare's avatar
      i2c-algo-bit: Add i2c_bit_add_numbered_bus · 0f3b4838
      Jean Delvare authored
      Add i2c_bit_add_numbered_bus(), which is equivalent to i2c_bit_add_bus
      except that it calls i2c_add_numbered_adapter() at the end instead of
      i2c_add_adapter().
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      0f3b4838
    • David Brownell's avatar
      i2c: i2c EXPORT_SYMBOL cleanup · c0564606
      David Brownell authored
      Make i2c-core.c obey Documentation/CodingStyle better by snugging
      the EXPORT_SYMBOL declarations next to the relevant definitions.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      c0564606
    • David Brownell's avatar
      i2c: Add i2c_add_numbered_adapter() · 6e13e641
      David Brownell authored
      This adds a call, i2c_add_numbered_adapter(), registering an I2C adapter
      with a specific bus number and then creating I2C device nodes for any
      pre-declared devices on that bus.  It builds on previous patches adding
      I2C probe() and remove() support, and that pre-declaration of devices.
      
      This completes the core support for "new style" I2C device drivers.
      Those follow the standard driver model for binding devices to drivers
      (using probe and remove methods) rather than a legacy model (where the
      driver tries to autoconfigure each bus, and registers devices itself).
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      6e13e641
    • David Brownell's avatar
      i2c: Add i2c_board_info and i2c_new_device() · 9c1600ed
      David Brownell authored
      This provides partial support for new-style I2C driver binding.  It builds
      on "struct i2c_board_info" declarations that identify I2C devices on a given
      board.  This is needed on systems with I2C devices that can't be fully probed
      and/or autoconfigured, such as many embedded Linux configurations where the
      way a given I2C device is wired may affect how it must be used.
      
      There are two models for declaring such devices:
      
       * LATE -- using a public function i2c_new_device().  This lets modules
         declare I2C devices found *AFTER* a given I2C adapter becomes available.
         
         For example, a PCI card could create adapters giving access to utility
         chips on that card, and this would be used to associate those chips with
         those adapters.
      
       * EARLY -- from arch_initcall() level code, using a non-exported function
         i2c_register_board_info().  This copies the declarations *BEFORE* such
         an i2c_adapter becomes available, arranging that i2c_new_device() will
         be called later when i2c-core registers the relevant i2c_adapter.
      
         For example, arch/.../.../board-*.c files would declare the I2C devices
         along with their platform data, and I2C devices would behave much like
         PNPACPI devices.  (That is, both enumerate from board-specific tables.)
      
      To match the exported i2c_new_device(), the previously-private function
      i2c_unregister_device() is now exported.
      
      Pending later patches using these new APIs, this is effectively a NOP.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      9c1600ed
    • David Brownell's avatar
      i2c: i2c probe() and remove() documented · 4298cfc3
      David Brownell authored
      Update Documentation/i2c to match previous patches updating probe()
      and remove() logic.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      4298cfc3
    • David Brownell's avatar
      i2c: i2c stack can remove() · a1d9e6e4
      David Brownell authored
      More update for new style driver support:  add a remove() method, and
      use it in the relevant code paths.
      
      Again, nothing will use this yet since there's nothing to create devices
      feeding this infrastructure.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      a1d9e6e4
    • David Brownell's avatar
      i2c: i2c stack can probe() · 7b4fbc50
      David Brownell authored
      One of a series of I2C infrastructure updates to support enumeration using
      the standard Linux driver model.
      
      This patch updates probe() and associated hotplug/coldplug support, but
      not remove().  Nothing yet _uses_ it to create I2C devices, so those
      hotplug/coldplug mechanisms will be the only externally visible change.
      This patch will be an overall NOP since the I2C stack doesn't yet create
      clients/devices except as part of binding them to legacy drivers.
      
      Some code is moved earlier in the source code, helping group more of the
      per-device infrastructure in one place and simplifying handling per-device
      attributes.
      
      Terminology being adopted:  "legacy drivers" create devices (i2c_client)
      themselves, while "new style" ones follow the driver model (the i2c_client
      is handed to the probe routine).  It's an either/or thing; the two models
      don't mix, and drivers that try mixing them won't even be registered.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      7b4fbc50
    • Jean Delvare's avatar
      i2c-pca-isa: Port to the new device driver model · 5cedb05d
      Jean Delvare authored
      Port the i2c-pca-isa driver to the new device driver model. I'm
      using Rene Herman's new isa bus type, as it fits the needs nicely. One
      benefit is that we can now give a proper parent to our i2c adapter.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      5cedb05d
    • Jean Delvare's avatar
      i2c-elektor: Port to the new device driver model · 4a5d3030
      Jean Delvare authored
      Port the i2c-elektor driver to the new device driver model. I'm
      using Rene Herman's new isa bus type, as it fits the needs nicely. One
      benefit is that we can now give a proper parent to our i2c adapter.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      4a5d3030
    • Jean Delvare's avatar
      i2c-parport-light: Port to the new device driver model · c6e8bb2c
      Jean Delvare authored
      Also fix a small race on driver unload: we need to unregister the
      i2c adapter before we power it off.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      c6e8bb2c
    • Jean Delvare's avatar
      i2c-parport: Fix a minor race on driver unload · 3af07bd2
      Jean Delvare authored
      When unloading the driver, we really want to unregister the i2c adapter
      before we power it off, rather than the other way around.
      
      Also speed up the bus a bit when we can sense SCL. The slaves will
      stretch the line as needed.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      3af07bd2
    • Jean Delvare's avatar
      scx200_acb: Fix PCI device reference count · 4b4686e7
      Jean Delvare authored
      The scx200_acb driver supports two kind of devices, PCI ones and ISA
      ones. Even ISA ones are detected using the presence of a given PCI
      device, and we get a reference to it, but never put it back, so we
      have a leak. Fix it.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      4b4686e7
    • Jean Delvare's avatar
      i2c: Cleanup the includes of <linux/i2c.h> · 7c59b661
      Jean Delvare authored
      Clean up the includes of <linux/i2c.h>. Only include this header file
      when we actually need it.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      7c59b661
    • Jean Delvare's avatar
      i2c-nforce2: Add support for the MCP61 and MCP65 · f75803de
      Jean Delvare authored
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Cc: Hans-Frieder Vogt <hfvogt@gmx.net>
      f75803de
    • Jean Delvare's avatar
      i2c-parport: Optimize binary size · cacf2269
      Jean Delvare authored
      Initialize the fields of the i2c_adapter structure individually,
      rather than copying a whole static template structure. This shaves
      off 474 bytes or 14% (on i386) from the binary size.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      cacf2269
    • Jean Delvare's avatar
      i2c-algo-bit: Emulate SMBus block read · 3c4bb241
      Jean Delvare authored
      Now that i2c-core lets the i2c bus drivers emulate the SMBus block read
      and SMBus block process call transaction types, let's implement that in
      the popular i2c bit-banging driver. This will also act as a reference
      implementation for other bus drivers which want to do the same.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      3c4bb241
    • Jean Delvare's avatar
      i2c: Emulate SMBus block read over I2C · 209d27c3
      Jean Delvare authored
      Let the I2C bus drivers emulate the SMBus Block Read and Block Process
      Call transactions if they wish. This requires to define a new message
      flag, which i2c-core will use to let the underlying I2C bus driver
      know that the first received byte will specify the length of the read
      message.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      209d27c3
    • Jean Delvare's avatar
      i2c-algo-bit: Always send a stop condition before leaving · 1ecac07a
      Jean Delvare authored
      The i2c-algo-bit driver doesn't behave well on read errors: it'll
      bail out without even sending a stop condition on the bus, so the bus
      will be stuck. So make sure that we always send a stop condition on
      the bus before we leave. The best way to make sure is to always send
      it at the end of function bit_xfer.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      1ecac07a
    • David Brownell's avatar
      i2c: Rename dev_to_i2c_adapter() · ef2c8321
      David Brownell authored
      Rename dev_to_i2c_adapter() as to_i2c_adapter(), since the previous
      syntax was a surprising and needless difference from normal naming
      conventions in Linux.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      ef2c8321
    • David Brownell's avatar
      i2c: Class attribute cleanup · 16ffadfc
      David Brownell authored
      This patch is a minor cleanup/code shrink, using class infrastructure
      in i2c-core to manage the i2c_adapter attribute.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      16ffadfc
    • David Brownell's avatar
      i2c: Shrink struct i2c_client · 2096b956
      David Brownell authored
      This shrinks the size of "struct i2c_client" by 40 bytes:
      
       - Substantially shrinks the string used to identify the chip type
       - The "flags" don't need to be so big
       - Removes some internal padding
      
      It also adds kerneldoc for that struct, explaining how "name" is really a
      chip type identifier; it's otherwise potentially confusing.
      
      Because the I2C_NAME_SIZE symbol was abused for both i2c_client.name
      and for i2c_adapter.name, this needed to affect i2c_adapter too.  The
      adapters which used that symbol now use the more-obviously-correct
      idiom of taking the size of that field.
      
      JD: Shorten i2c_adapter.name from 50 to 48 bytes while we're here, to
      avoid wasting space in padding.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      2096b956
    • David Brownell's avatar
      i2c: i2c_register_driver() cleanup · 4ad4eac6
      David Brownell authored
      Minor cleanup in i2c_register_driver():  use list_for_each_entry().
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      4ad4eac6
    • Jean Delvare's avatar
      i2c: i2c_adapter devices need no driver · b31366f4
      Jean Delvare authored
      Kill i2c_adapter_driver as it doesn't make sense and it prevents
      further i2c-core cleanups. i2c_adapter devices are virtual devices
      (ex-class devices) and as such they don't need a driver.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      b31366f4
    • Jean Delvare's avatar
      i2c: Kill i2c_adapter.class_dev · fccb56e4
      Jean Delvare authored
      Kill i2c_adapter.class_dev. Instead, set the class of i2c_adapter.dev
      to i2c_adapter_class, so that a symlink will be created for every
      i2c_adapter in /sys/class/i2c-adapter.
      
      The same change must be mirrored to i2c-isa as it duplicates some
      of the i2c-core functionalities.
      
      User-space tools and libraries might need some adjustments. In
      particular, libsensors from lm_sensors 2.10.3 or later is required for
      proper discovery of i2c adapter names after this change.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      fccb56e4
    • Linus Torvalds's avatar
      libata: honour host controllers that want just one host · dc87c398
      Linus Torvalds authored
      The Marvell IDE interface on my machine would hit a BUG_ON() in
      lib/iomem.c because it was calling ata_pci_init_one() specifying just a
      single port on the host, but that would actually end up trying to
      initialize two ports, the second one with bogus information.
      
      This fixes "ata_pci_init_one()" so that it actually passes down the
      n_ports variable that it got from the low-level driver to the host
      allocation routine ("ata_host_alloc_pinfo()"), which results in the ATA
      layer actually having the correct port number information.
      
      And in order to make it all work, I also needed to fix a few places that
      had incorrectly hard-coded the fact that a host always had exactly two
      ports (both ata_pci_init_bmdma() and ata_request_legacy_irqs() would
      just always iterate over both ports).
      Acked-by: default avatarJeff Garzik <jeff@garzik.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      dc87c398
  2. 30 Apr, 2007 14 commits
    • David Rientjes's avatar
      pm: include EIO from errno-base.h · 14e38ac8
      David Rientjes authored
      For backwards compatibility, call_platform_enable_wakeup() can return 0
      instead of -EIO since we aren't guaranteed to have errno defined.
      
      Cc: David Brownell <david-b@pacbell.net>
      Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
      Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      14e38ac8
    • Jeremy Fitzhardinge's avatar
      Add kvasprintf() · 11443ec7
      Jeremy Fitzhardinge authored
      Add a kvasprintf() function to complement kasprintf().
      
      No in-tree users yet, but I have some coming up.
      
      [akpm@linux-foundation.org: EXPORT it]
      Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Keir Fraser <keir@xensource.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      11443ec7
    • Johannes Berg's avatar
      power management: force pm_ops.valid callback to be assigned · 9684e51c
      Johannes Berg authored
      This patch changes the docs and behaviour from "all states valid" to "no
      states valid" if no .valid callback is assigned.  Users of pm_ops that only
      need mem sleep can assign pm_valid_only_mem without any overhead, others
      will require more elaborate callbacks.
      
      Now that all users of pm_ops have a .valid callback this is a safe thing to
      do and prevents things from getting messy again as they were before.
      Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
      Acked-by: default avatarPavel Machek <pavel@ucw.cz>
      Looks-okay-to: Rafael J. Wysocki <rjw@sisk.pl>
      Cc: <linux-pm@lists.linux-foundation.org>
      Cc: Greg KH <greg@kroah.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9684e51c
    • Johannes Berg's avatar
      power management: implement pm_ops.valid for everybody · e8c9c502
      Johannes Berg authored
      Almost all users of pm_ops only support mem sleep, don't check in .valid and
      don't reject any others in .prepare so users can be confused if they check
      /sys/power/state, especially when new states are added (these would then
      result in s-t-r although they're supposed to be something different).
      
      This patch implements a generic pm_valid_only_mem function that is then
      exported for users and puts it to use in almost all existing pm_ops.
      Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
      Cc: David Brownell <david-b@pacbell.net>
      Acked-by: default avatarPavel Machek <pavel@ucw.cz>
      Cc: linux-pm@lists.linux-foundation.org
      Cc: Len Brown <lenb@kernel.org>
      Acked-by: default avatarRussell King <rmk@arm.linux.org.uk>
      Cc: Greg KH <greg@kroah.com>
      Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
      Cc: Paul Mundt <lethal@linux-sh.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e8c9c502
    • Johannes Berg's avatar
      power management: remove firmware disk mode · 11d77d0c
      Johannes Berg authored
      This patch removes the firmware disk suspend mode which is the wrong approach,
      it is supposed to be used for implementing firmware-based disk suspend but
      cannot actually be used for that.
      Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
      Acked-by: default avatarPavel Machek <pavel@ucw.cz>
      Cc: <linux-pm@lists.linux-foundation.org>
      Cc: David Brownell <david-b@pacbell.net>
      Cc: Len Brown <lenb@kernel.org>
      Acked-by: default avatarRussell King <rmk@arm.linux.org.uk>
      Cc: Greg KH <greg@kroah.com>
      Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
      Cc: Paul Mundt <lethal@linux-sh.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      11d77d0c
    • Johannes Berg's avatar
      rework pm_ops pm_disk_mode, kill misuse · fe0c935a
      Johannes Berg authored
      This patch series cleans up some misconceptions about pm_ops.  Some users of
      the pm_ops structure attempt to use it to stop the user from entering suspend
      to disk, this, however, is not possible since the user can always use
      "shutdown" in /sys/power/disk and then the pm_ops are never invoked.  Also,
      platforms that don't support suspend to disk simply should not allow
      configuring SOFTWARE_SUSPEND (read the help text on it, it only selects
      suspend to disk and nothing else, all the other stuff depends on PM).
      
      The pm_ops structure is actually intended to provide a way to enter
      platform-defined sleep states (currently supported states are "standby" and
      "mem" (suspend to ram)) and additionally (if SOFTWARE_SUSPEND is configured)
      allows a platform to support a platform specific way to enter low-power mode
      once everything has been saved to disk.  This is currently only used by ACPI
      (S4).
      
      This patch:
      
      The pm_ops.pm_disk_mode is used in totally bogus ways since nobody really
      seems to understand what it actually does.
      
      This patch clarifies the pm_disk_mode description.
      
      It also removes all the arm and sh users that think they can veto suspend to
      disk via pm_ops; not so since the user can always do echo shutdown >
      /sys/power/disk, they need to find a better way involving Kconfig or such.
      
      ACPI is the only user left with a non-zero pm_disk_mode.
      
      The patch also sets the default mode to shutdown again, but when a new pm_ops
      is registered its pm_disk_mode is selected as default, that way the default
      stays for ACPI where it is apparently required.
      Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
      Cc: David Brownell <david-b@pacbell.net>
      Acked-by: default avatarPavel Machek <pavel@ucw.cz>
      Cc: <linux-pm@lists.linux-foundation.org>
      Cc: Len Brown <lenb@kernel.org>
      Acked-by: default avatarRussell King <rmk@arm.linux.org.uk>
      Cc: Greg KH <greg@kroah.com>
      Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
      Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fe0c935a
    • Jeff Mahoney's avatar
      reiserfs: suppress lockdep warning · 1173a729
      Jeff Mahoney authored
      We're getting lockdep warnings due to a post-2.6.21-rc7 bugfix.
      
      The xattr_sem can never be taken in the manner described. Internal inodes
      are protected by I_PRIVATE.  Add the appropriate annotation.
      
      Cc: <stable@kernel.org>
      Cc: "Antonino A. Daplas" <adaplas@pol.net>
      Cc: Takashi Iwai <tiwai@suse.de>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1173a729
    • Robert Peterson's avatar
      Extend print_symbol capability · 42e38083
      Robert Peterson authored
      Today's print_symbol function dumps a kernel symbol with printk.  This
      patch extends the functionality of kallsyms.c so that the symbol lookup
      function may be used without the printk.  This is useful for modules that
      want to dump symbols elsewhere, for example, to debugfs.  I intend to use
      the new function call in the GFS2 file system (which will be a separate
      patch).
      
      [akpm@linux-foundation.org: build fix]
      [clameter@sgi.com: sprint_symbol should return length of string like sprintf]
      Signed-off-by: default avatarRobert Peterson <rpeterso@redhat.com>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Cc: Roman Zippel <zippel@linux-m68k.org>
      Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Acked-by: default avatarPaulo Marques <pmarques@grupopie.com>
      Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      42e38083
    • David S. Miller's avatar
      [UDP]: Do not allow specific bind when wildcard bind exists. · de34ed91
      David S. Miller authored
      When allocating local ports, do not allow a bind to a port
      with a specific local address when a bind to that port with
      a wildcard local address already exists.
      
      Noticed by Linus.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      de34ed91
    • David S. Miller's avatar
      [IPV4] UDP: Fix endianness bugs in hashing changes. · b7b5f487
      David S. Miller authored
      I accidently applied an earlier version of Eric Dumazet's patch, from
      March 21st.  His version from March 30th didn't have these bugs, so
      this just interdiffs to the correct patch.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b7b5f487
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 40caf5ea
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (56 commits)
        ieee1394: remove garbage from Kconfig
        ieee1394: more help in Kconfig
        ieee1394: ohci1394: Fix mistake in printk message.
        ieee1394: ohci1394: remove unnecessary rcvPhyPkt bit flipping in LinkControl register
        ieee1394: ohci1394: fix cosmetic problem in error logging
        ieee1394: eth1394: send async streams at S100 on 1394b buses
        ieee1394: eth1394: fix error path in module_init
        ieee1394: eth1394: correct return codes in hard_start_xmit
        ieee1394: eth1394: hard_start_xmit is called in atomic context
        ieee1394: eth1394: some conditions are unlikely
        ieee1394: eth1394: clean up fragment_overlap
        ieee1394: eth1394: don't use alloc_etherdev
        ieee1394: eth1394: omit useless set_mac_address callback
        ieee1394: eth1394: CONFIG_INET is always defined
        ieee1394: eth1394: allow MTU bigger than 1500
        ieee1394: unexport highlevel_host_reset
        ieee1394: eth1394: contain host reset
        ieee1394: eth1394: shorter error messages
        ieee1394: eth1394: correct a memset argument
        ieee1394: eth1394: refactor .probe and .update
        ...
      40caf5ea
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid · d6454706
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid: (21 commits)
        USB HID: don't warn on idVendor == 0
        USB HID: add 'quirks' module parameter
        USB HID: add support for dynamically-created quirks
        USB HID: clarify static quirk handling as squirks
        USB HID: encapsulate quirk handling into hid-quirks.c
        USB HID: EMS USBII device needs HID_QUIRK_MULTI_INPUT
        HID: update copyright and authorship macro
        HID: introduce proper zeroing of unused bits in output reports
        USB HID: add support for WiseGroup MP-8800 Quad Joypad
        USB HID: add FF support for Logitech Force 3D Pro Joystick
        USB HID: numlock quirk for dell W7658 keyboard
        USB HID: Logitech MX3000 keyboard needs report descriptor quirk
        USB HID: extend quirk for Logitech S510 keyboard
        USB HID: usbkbd/usbmouse - handle errors when registering devices
        USB HID: add QUIRK_HIDDEV for Belkin Flip KVM
        HID: enable dead keys on a belkin wireless keyboard
        USB HID: Thustmaster firestorm dual power v1 support
        USB HID: specify explicit size for hid_blacklist.quirks
        USB HID: fix retry & reset logic
        USB HID: consolidate vendor/product ids
        ...
      d6454706
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 152a6a9d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
        [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts
        [IPV4] SNMP: Support InMcastPkts and InBcastPkts
        [IPV4] SNMP: Support InTruncatedPkts
        [IPV4] SNMP: Support InNoRoutes
        [SNMP]: Add definitions for {In,Out}BcastPkts
        [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent
        [TCP] FRTO: Delay skb available check until it's mandatory
        [XFRM]: Restrict upper layer information by bundle.
        [TCP]: Catch skb with S+L bugs earlier
        [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algo
        [L2TP]: Add the ability to autoload a pppox protocol module.
        [SKB]: Introduce skb_queue_walk_safe()
        [AF_IUCV/IUCV]: smp_call_function deadlock
        [IPV6]: Fix slab corruption running ip6sic
        [TCP]: Update references in two old comments
        [XFRM]: Export SPD info
        [IPV6]: Track device renames in snmp6.
        [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage.
        [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats.
        [NETPOLL]: Remove CONFIG_NETPOLL_RX
        ...
      152a6a9d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block · cd9bb7e7
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
        [PATCH] elevator: elv_list_lock does not need irq disabling
        [BLOCK] Don't pin lots of memory in mempools
        cfq-iosched: speedup cic rb lookup
        ll_rw_blk: add io_context private pointer
        cfq-iosched: get rid of cfqq hash
        cfq-iosched: tighten queue request overlap condition
        cfq-iosched: improve sync vs async workloads
        cfq-iosched: never allow an async queue idling
        cfq-iosched: get rid of ->dispatch_slice
        cfq-iosched: don't pass unused preemption variable around
        cfq-iosched: get rid of ->cur_rr and ->cfq_list
        cfq-iosched: slice offset should take ioprio into account
        [PATCH] cfq-iosched: style cleanups and comments
        cfq-iosched: sort IDLE queues into the rbtree
        cfq-iosched: sort RT queues into the rbtree
        [PATCH] cfq-iosched: speed up rbtree handling
        cfq-iosched: rework the whole round-robin list concept
        cfq-iosched: minor updates
        cfq-iosched: development update
        cfq-iosched: improve preemption for cooperating tasks
      cd9bb7e7