1. 17 Mar, 2011 31 commits
  2. 16 Mar, 2011 9 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · 7a636280
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)
        bonding: enable netpoll without checking link status
        xfrm: Refcount destination entry on xfrm_lookup
        net: introduce rx_handler results and logic around that
        bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
        bonding: wrap slave state work
        net: get rid of multiple bond-related netdevice->priv_flags
        bonding: register slave pointer for rx_handler
        be2net: Bump up the version number
        be2net: Copyright notice change. Update to Emulex instead of ServerEngines
        e1000e: fix kconfig for crc32 dependency
        netfilter ebtables: fix xt_AUDIT to work with ebtables
        xen network backend driver
        bonding: Improve syslog message at device creation time
        bonding: Call netif_carrier_off after register_netdevice
        bonding: Incorrect TX queue offset
        net_sched: fix ip_tos2prio
        xfrm: fix __xfrm_route_forward()
        be2net: Fix UDP packet detected status in RX compl
        Phonet: fix aligned-mode pipe socket buffer header reserve
        netxen: support for GbE port settings
        ...
      
      Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
      with the staging updates.
      7a636280
    • Linus Torvalds's avatar
      Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 6445ced8
      Linus Torvalds authored
      * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (961 commits)
        staging: hv: fix memory leaks
        staging: hv: Remove NULL check before kfree
        Staging: hv: Get rid of vmbus_child_dev_add()
        Staging: hv: Change the signature for vmbus_child_device_register()
        Staging: hv: Get rid of vmbus_cleanup() function
        Staging: hv: Get rid of vmbus_dev_rm() function
        Staging: hv: Change the signature for vmbus_on_isr()
        Staging: hv: Eliminate vmbus_event_dpc()
        Staging: hv: Get rid of the function vmbus_msg_dpc()
        Staging: hv: Change the signature for vmbus_cleanup()
        Staging: hv: Simplify root device management
        staging: rtl8192e: Don't copy dev pointer to skb
        staging: rtl8192e: Pass priv to cmdpkt functions
        staging: rtl8192e: Pass priv to firmware download functions
        staging: rtl8192e: Pass priv to rtl8192_interrupt
        staging: rtl8192e: Pass rtl8192_priv to dm functions
        staging: rtl8192e: Pass ieee80211_device to callbacks
        staging: rtl8192e: Pass ieee80211_device to callbacks
        staging: rtl8192e: Pass ieee80211_device to callbacks
        staging: rtl8192e: Pass ieee80211_device to callbacks
        ...
      6445ced8
    • Linus Torvalds's avatar
      Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · e6bee325
      Linus Torvalds authored
      * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)
        pch_uart: reference clock on CM-iTC
        pch_phub: add new device ML7213
        n_gsm: fix UIH control byte : P bit should be 0
        n_gsm: add a documentation
        serial: msm_serial_hs: Add MSM high speed UART driver
        tty_audit: fix tty_audit_add_data live lock on audit disabled
        tty: move cd1865.h to drivers/staging/tty/
        Staging: tty: fix build with epca.c driver
        pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
        Staging: generic_serial: fix double locking bug
        nozomi: don't use flush_scheduled_work()
        tty/serial: Relax the device_type restriction from of_serial
        MAINTAINERS: Update HVC file patterns
        tty: phase out of ioctl file pointer for tty3270 as well
        tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
        pch_uart: Fix DMA channel miss-setting issue.
        pch_uart: fix exclusive access issue
        pch_uart: fix auto flow control miss-setting issue
        pch_uart: fix uart clock setting issue
        pch_uart : Use dev_xxx not pr_xxx
        ...
      
      Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
      twice, then changes to the same area in one branch)
      e6bee325
    • Linus Torvalds's avatar
      Merge branch 'driver-core-next' of... · a5e6b135
      Linus Torvalds authored
      Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
      
      * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (50 commits)
        printk: do not mangle valid userspace syslog prefixes
        efivars: Add Documentation
        efivars: Expose efivars functionality to external drivers.
        efivars: Parameterize operations.
        efivars: Split out variable registration
        efivars: parameterize efivars
        efivars: Make efivars bin_attributes dynamic
        efivars: move efivars globals into struct efivars
        drivers:misc: ti-st: fix debugging code
        kref: Fix typo in kref documentation
        UIO: add PRUSS UIO driver support
        Fix spelling mistakes in Documentation/zh_CN/SubmittingPatches
        firmware: Fix unaligned memory accesses in dmi-sysfs
        firmware: Add documentation for /sys/firmware/dmi
        firmware: Expose DMI type 15 System Event Log
        firmware: Break out system_event_log in dmi-sysfs
        firmware: Basic dmi-sysfs support
        firmware: Add DMI entry types to the headers
        Driver core: convert platform_{get,set}_drvdata to static inline functions
        Translate linux-2.6/Documentation/magic-number.txt into Chinese
        ...
      a5e6b135
    • Linus Torvalds's avatar
      Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 971f115a
      Linus Torvalds authored
      * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (172 commits)
        USB: Add support for SuperSpeed isoc endpoints
        xhci: Clean up cycle bit math used during stalls.
        xhci: Fix cycle bit calculation during stall handling.
        xhci: Update internal dequeue pointers after stalls.
        USB: Disable auto-suspend for USB 3.0 hubs.
        USB: Remove bogus USB_PORT_STAT_SUPER_SPEED symbol.
        xhci: Return canceled URBs immediately when host is halted.
        xhci: Fixes for suspend/resume of shared HCDs.
        xhci: Fix re-init on power loss after resume.
        xhci: Make roothub functions deal with device removal.
        xhci: Limit roothub ports to 15 USB3 & 31 USB2 ports.
        xhci: Return a USB 3.0 hub descriptor for USB3 roothub.
        xhci: Register second xHCI roothub.
        xhci: Change xhci_find_slot_id_by_port() API.
        xhci: Refactor bus suspend state into a struct.
        xhci: Index with a port array instead of PORTSC addresses.
        USB: Set usb_hcd->state and flags for shared roothubs.
        usb: Make core allocate resources per PCI-device.
        usb: Store bus type in usb_hcd, not in driver flags.
        usb: Change usb_hcd->bandwidth_mutex to a pointer.
        ...
      971f115a
    • Linus Torvalds's avatar
    • Miklos Szeredi's avatar
      fix cdev leak on O_PATH final fput() · 60ed8cf7
      Miklos Szeredi authored
      __fput doesn't need a cdev_put() for O_PATH handles.
      
      Signed-off-by: mszeredi@suse.cz
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      60ed8cf7
    • Andy Gospodarek's avatar
      bonding: enable netpoll without checking link status · ceda86a1
      Andy Gospodarek authored
      Only slaves that are up should transmit netpoll frames, so there is no
      need to check to see if a slave is up before enabling netpoll on it.
      This resolves a reported failure on active-backup bonds where a slave
      interface is down when netpoll was enabled.
      Signed-off-by: default avatarAndy Gospodarek <andy@greyhouse.net>
      Tested-by: default avatarWANG Cong <amwang@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ceda86a1
    • Steffen Klassert's avatar
      xfrm: Refcount destination entry on xfrm_lookup · fbd50608
      Steffen Klassert authored
      We return a destination entry without refcount if a socket
      policy is found in xfrm_lookup. This triggers a warning on
      a negative refcount when freeeing this dst entry. So take
      a refcount in this case to fix it.
      
      This refcount was forgotten when xfrm changed to cache bundles
      instead of policies for outgoing flows.
      Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
      Acked-by: default avatarTimo Teräs <timo.teras@iki.fi>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fbd50608