1. 18 Nov, 2010 3 commits
  2. 17 Nov, 2010 5 commits
  3. 16 Nov, 2010 2 commits
  4. 15 Nov, 2010 1 commit
    • Andy Whitcroft's avatar
      net: rtnetlink.h -- only include linux/netdevice.h when used by the kernel · 3b42a96d
      Andy Whitcroft authored
      The commit below added a new helper dev_ingress_queue to cleanly obtain the
      ingress queue pointer.  This necessitated including 'linux/netdevice.h':
      
        commit 24824a09
        Author: Eric Dumazet <eric.dumazet@gmail.com>
        Date:   Sat Oct 2 06:11:55 2010 +0000
      
          net: dynamic ingress_queue allocation
      
      However this include triggers issues for applications in userspace
      which use the rtnetlink interfaces.  Commonly this requires they include
      'net/if.h' and 'linux/rtnetlink.h' leading to a compiler error as below:
      
        In file included from /usr/include/linux/netdevice.h:28:0,
                         from /usr/include/linux/rtnetlink.h:9,
                         from t.c:2:
        /usr/include/linux/if.h:135:8: error: redefinition of ‘struct ifmap’
        /usr/include/net/if.h:112:8: note: originally defined here
        /usr/include/linux/if.h:169:8: error: redefinition of ‘struct ifreq’
        /usr/include/net/if.h:127:8: note: originally defined here
        /usr/include/linux/if.h:218:8: error: redefinition of ‘struct ifconf’
        /usr/include/net/if.h:177:8: note: originally defined here
      
      The new helper is only defined for the kernel and protected by __KERNEL__
      therefore we can simply pull the include down into the same protected
      section.
      Signed-off-by: default avatarAndy Whitcroft <apw@canonical.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3b42a96d
  5. 13 Nov, 2010 6 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 9457b24a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (66 commits)
        can-bcm: fix minor heap overflow
        gianfar: Do not call device_set_wakeup_enable() under a spinlock
        ipv6: Warn users if maximum number of routes is reached.
        docs: Add neigh/gc_thresh3 and route/max_size documentation.
        axnet_cs: fix resume problem for some Ax88790 chip
        ipv6: addrconf: don't remove address state on ifdown if the address is being kept
        tcp: Don't change unlocked socket state in tcp_v4_err().
        x25: Prevent crashing when parsing bad X.25 facilities
        cxgb4vf: add call to Firmware to reset VF State.
        cxgb4vf: Fail open if link_start() fails.
        cxgb4vf: flesh out PCI Device ID Table ...
        cxgb4vf: fix some errors in Gather List to skb conversion
        cxgb4vf: fix bug in Generic Receive Offload
        cxgb4vf: don't implement trivial (and incorrect) ndo_select_queue()
        ixgbe: Look inside vlan when determining offload protocol.
        bnx2x: Look inside vlan when determining checksum proto.
        vlan: Add function to retrieve EtherType from vlan packets.
        virtio-net: init link state correctly
        ucc_geth: Fix deadlock
        ucc_geth: Do not bring the whole IF down when TX failure.
        ...
      9457b24a
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 80ef913f
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        drivers/ata/pata_octeon_cf.c: delete double assignment
        pata_legacy: fix CONFIG_PATA_WINBOND_VLB_MODULE test
        libata: fix NULL sdev dereference race in atapi_qc_complete()
      80ef913f
    • Linus Torvalds's avatar
      Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 1c32ca9f
      Linus Torvalds authored
      * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (38 commits)
        Revert "staging: tidspbridge: replace iommu custom for opensource implementation"
        Revert "staging: tidspbridge - move shared memory iommu maps to tiomap3430.c"
        Revert "staging: tidspbridge - rename bridge_brd_mem_map/unmap to a proper name"
        Revert "staging: tidspbridge - remove custom mmu code from tiomap3430.c"
        Revert "staging: tidspbridge - fix mmufault support"
        Revert "staging: tidspbridge - remove hw directory"
        Revert "staging: tidspbridge - move all iommu related code to a new file"
        Revert "staging: tidspbridge: remove dw_dmmu_base from cfg_hostres struct"
        Revert "staging: tidspbridge - remove reserved memory clean up"
        Revert "staging: tidspbridge - deprecate reserve/unreserve_memory funtions"
        Revert "staging: tidspbridge - remove dmm custom module"
        Revert "staging: tidspbridge - update Kconfig to select IOMMU module"
        staging: tidspbridge: hardcode SCM macros while fix is upstreamed
        Staging: keucr driver: fix uninitialized variable & proper memset length
        omap: dsp: remove shm from normal memory
        Staging: wlan-ng: Fix wrong #ifdef #endif sequence
        Staging: Update parameters for cfg80211 key management operation
        Staging: ath6kl: Fix pointer casts on 64-bit architectures
        Staging: batman-adv: suppress false warning when changing the mac address
        Staging: batman-adv: fix interface alternating and bonding reggression
        ...
      1c32ca9f
    • Linus Torvalds's avatar
      Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 00dad7fa
      Linus Torvalds authored
      * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (28 commits)
        Revert "USB: xhci: Use GFP_ATOMIC under spin_lock"
        USB: ohci-jz4740: Fix spelling in MODULE_ALIAS
        UWB: Return UWB_RSV_ALLOC_NOT_FOUND rather than crashing on NULL dereference if kzalloc fails
        usb: core: fix information leak to userland
        usb: misc: iowarrior: fix information leak to userland
        usb: misc: sisusbvga: fix information leak to userland
        usb: subtle increased memory usage in u_serial
        USB: option: fix when the driver is loaded incorrectly for some Huawei devices.
        USB: xhci: Use GFP_ATOMIC under spin_lock
        usb: gadget: goku_udc: add registered flag bit, fixing build
        USB: ehci/mxc: compile fix
        USB: Fix FSL USB driver on non Open Firmware systems
        USB: the development of the usb tree is now in git
        usb: musb: fail unaligned DMA transfers on v1.8 and above
        USB: ftdi_sio: add device IDs for Milkymist One JTAG/serial
        usb.h: fix ioctl kernel-doc info
        usb: musb: gadget: kill duplicate code in musb_gadget_queue()
        usb: musb: Fix handling of spurious SESSREQ
        usb: musb: fix kernel oops when loading musb_hdrc module for the 2nd time
        USB: musb: blackfin: push clkin value to platform resources
        ...
      00dad7fa
    • Linus Torvalds's avatar
      Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · edaa4d66
      Linus Torvalds authored
      * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
        n_gsm: Fix length handling
        n_gsm: Copy n2 over when configuring via ioctl interface
        serial: bfin_5xx: grab port lock before making port termios changes
        serial: bfin_5xx: disable CON_PRINTBUFFER for consoles
        serial: bfin_5xx: remove redundant SSYNC to improve TX speed
        serial: bfin_5xx: always include DMA headers
        vcs: make proper usage of the poll flags
        amiserial: Remove unused variable icount
        8250: Fix tcsetattr to avoid ioctl(TIOCMIWAIT) hang
        tty_ldisc: Fix BUG() on hangup
        TTY: restore tty_ldisc_wait_idle
        SERIAL: blacklist si3052 chip
        drivers/serial/bfin_5xx.c: Fix line continuation defects
        tty: prevent DOS in the flush_to_ldisc
        8250: add support for Kouwell KW-L221N-2
        nozomi: Fix warning from the previous TIOCGCOUNT changes
        tty: fix warning in synclink driver
        tty: Fix formatting in tty.h
        tty: the development tree is now done in git
      edaa4d66
    • Linus Torvalds's avatar
      Merge branch 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen · 891cbd30
      Linus Torvalds authored
      * 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
        xen: do not release any memory under 1M in domain 0
        xen: events: do not unmask event channels on resume
        xen: correct size of level2_kernel_pgt
      891cbd30
  6. 12 Nov, 2010 23 commits