1. 14 Oct, 2008 8 commits
  2. 13 Oct, 2008 13 commits
  3. 11 Oct, 2008 19 commits
    • Guennadi Liakhovetski's avatar
      smc911x: Fix external PHY detection · f3073ac7
      Guennadi Liakhovetski authored
      If an external PHY is found the driver falls through to the default
      case in the switch and overwrites the PHY ID. Add the missing break.
      Signed-off-by: default avatarGuennadi Liakhovetski <lg@denx.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f3073ac7
    • Patrick McHardy's avatar
      e1000: allow VLAN devices to use TSO and CSUM offload · 20501a69
      Patrick McHardy authored
      This patch changes e1000 to set vlan_features so TSO and CSUM
      offload can be used by VLAN devices, similar as with the other
      Intel drivers.
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      20501a69
    • Herbert Xu's avatar
      gre: Initialise rtnl_link tunnel parameters properly · 7bb82d92
      Herbert Xu authored
      Brown paper bag error of calling memset with sizeof(p) instead
      of sizeof(*p).
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7bb82d92
    • David S. Miller's avatar
      ipvs: Add proper dependencies on IP_VS, and fix description header line. · f901b644
      David S. Miller authored
      Linus noted a build failure case:
      
      net/netfilter/ipvs/ip_vs_xmit.c: In function 'ip_vs_tunnel_xmit':
      net/netfilter/ipvs/ip_vs_xmit.c:616: error: implicit declaration of function 'ip_select_ident'
      
      The proper include file (net/ip.h) is being included in ip_vs_xmit.c to get
      that declaration.  So the only possible case where this can happen is if
      CONFIG_INET is not enabled.
      
      This seems to be purely a missing dependency in the ipvs/Kconfig file IP_VS
      entry.
      
      Also, while we're here, remove the out of date "EXPERIMENTAL" string in the
      IP_VS config help header line.  IP_VS no longer depends upon CONFIG_EXPERIMENTAL
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f901b644
    • Linus Torvalds's avatar
      Merge phase #3 (IOMMU) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · bf6f51e3
      Linus Torvalds authored
      * 'x86-v28-for-linus-phase3-B' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (74 commits)
        AMD IOMMU: use iommu_device_max_index, fix
        AMD IOMMU: use iommu_device_max_index
        x86: add PCI IDs for AMD Barcelona PCI devices
        x86/iommu: use __GFP_ZERO instead of memset for GART
        x86/iommu: convert GART need_flush to bool
        x86/iommu: make GART driver checkpatch clean
        x86 gart: remove unnecessary initialization
        x86: restore old GART alloc_coherent behavior
        revert "x86: make GART to respect device's dma_mask about virtual mappings"
        x86: export pci-nommu's alloc_coherent
        iommu: remove fullflush and nofullflush in IOMMU generic option
        x86: remove set_bit_string()
        iommu: export iommu_area_reserve helper function
        AMD IOMMU: use coherent_dma_mask in alloc_coherent
        add AMD IOMMU tree to MAINTAINERS file
        AMD IOMMU: use cmd_buf_size when freeing the command buffer
        AMD IOMMU: calculate IVHD size with a function
        AMD IOMMU: remove unnecessary cast to u64 in the init code
        AMD IOMMU: free domain bitmap with its allocation order
        AMD IOMMU: simplify dma_mask_to_pages
        ...
      bf6f51e3
    • Linus Torvalds's avatar
      Merge phase #2 (PAT updates) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · ec8deffa
      Linus Torvalds authored
      * 'x86-v28-for-linus-phase2-B' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits)
        x86, cpa: make the kernel physical mapping initialization a two pass sequence, fix
        x86, pat: cleanups
        x86: fix pagetable init 64-bit breakage
        x86: track memtype for RAM in page struct
        x86, cpa: srlz cpa(), global flush tlb after splitting big page and before doing cpa
        x86, cpa: remove cpa pool code
        x86, cpa: no need to check alias for __set_pages_p/__set_pages_np
        x86, cpa: dont use large pages for kernel identity mapping with DEBUG_PAGEALLOC
        x86, cpa: make the kernel physical mapping initialization a two pass sequence
        x86, cpa: remove USER permission from the very early identity mapping attribute
        x86, cpa: rename PTE attribute macros for kernel direct mapping in early boot
        x86: make sure the CPA test code's use of _PAGE_UNUSED1 is obvious
        linux-next: fix x86 tree build failure
        x86: have set_memory_array_{uc,wb} coalesce memtypes, fix
        agp: enable optimized agp_alloc_pages methods
        x86: have set_memory_array_{uc,wb} coalesce memtypes.
        x86: {reverve,free}_memtype() take a physical address
        x86: fix pageattr-test
        agp: add agp_generic_destroy_pages()
        agp: generic_alloc_pages()
        ...
      ec8deffa
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 7cc4e87f
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
        [ARM] 5300/1: fixup spitz reset during boot
        [ARM] 5295/1: make ZONE_DMA optional
        [ARM] 5239/1: Palm Zire 72 power management support
        [ARM] 5298/1: Drop desc_handle_irq()
        [ARM] 5297/1: [KS8695] Fix two compile-time warnings
        [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
        [ARM] pxa: allow multi-machine PCMCIA builds
        [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
        [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
        [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
        [ARM] pxa/zylonite: add support for USB OHCI
        [ARM] ohci-pxa27x: use ioremap() and offset for register access
        [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
        [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
        [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
        [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
        [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
        [ARM] pxa: simplify DMA register definitions
        [ARM] pxa: make additional DCSR bits valid for PXA3xx
        [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
        ...
      
      Fixed up conflicts in
      	arch/arm/mach-versatile/core.c
      	sound/soc/pxa/pxa2xx-ac97.c
      	sound/soc/pxa/pxa2xx-i2s.c
      manually.
      7cc4e87f
    • Arjan van de Ven's avatar
      security: avoid calling a NULL function pointer in drivers/video/tvaudio.c · 5ba2f67a
      Arjan van de Ven authored
      NULL function pointers are very bad security wise. This one got caught by
      kerneloops.org quite a few times, so it's happening in the field....
      
      Fix is simple, check the function pointer for NULL, like 6 other places
      in the same function are already doing.
      Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5ba2f67a
    • Linus Torvalds's avatar
      net: fix dummy 'nf_conntrack_event_cache()' · 64f1b653
      Linus Torvalds authored
      The dummy version of 'nf_conntrack_event_cache()' (used when the
      NF_CONNTRACK_EVENTS config option is not enabled) had not been updated
      when the calling convention changed.
      
      This was introduced by commit a71996fc
      ("netfilter: netns nf_conntrack: pass conntrack to
      nf_conntrack_event_cache() not skb")
      
      Tssk.
      
      Cc: Alexey Dobriyan <adobriyan@gmail.com>
      Cc: Patrick McHardy <kaber@trash.net>
      Cc: David Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      64f1b653
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · 4dd9ec49
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1075 commits)
        myri10ge: update driver version number to 1.4.3-1.369
        r8169: add shutdown handler
        r8169: preliminary 8168d support
        r8169: support additional 8168cp chipset
        r8169: change default behavior for mildly identified 8168c chipsets
        r8169: add a new 8168cp flavor
        r8169: add a new 8168c flavor (bis)
        r8169: add a new 8168c flavor
        r8169: sync existing 8168 device hardware start sequences with vendor driver
        r8169: 8168b Tx performance tweak
        r8169: make room for more specific 8168 hardware start procedure
        r8169: shuffle some registers handling around (8168 operation only)
        r8169: new phy init parameters for the 8168b
        r8169: update phy init parameters
        r8169: wake up the PHY of the 8168
        af_key: fix SADB_X_SPDDELETE response
        ath9k: Fix return code when ath9k_hw_setpower() fails on reset
        ath9k: remove nasty FAIL macro from ath9k_hw_reset()
        gre: minor cleanups in netlink interface
        gre: fix copy and paste error
        ...
      4dd9ec49
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 86ed5a93
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] Check that last search entry resume key is valid
        [CIFS] make sure we have the right resume info before calling CIFSFindNext
        [CIFS]  clean up error handling in cifs_unlink
        [CIFS] fix some settings of cifsAttrs after calling SetFileInfo and SetPathInfo
        cifs: explicitly revoke SPNEGO key after session setup
        cifs: Convert cifs to new aops.
        [CIFS] update DOS attributes in cifsInode if we successfully changed them
        cifs: remove NULL termination from rename target in CIFSSMBRenameOpenFIle
        cifs: work around samba returning -ENOENT on SetFileDisposition call
        cifs: fix inverted NULL check after kmalloc
        [CIFS] clean up upcall handling for dns_resolver keys
        [CIFS]  fix busy-file renames and refactor cifs_rename logic
        cifs: add function to set file disposition
        [CIFS] add constants for string lengths of keynames in SPNEGO upcall string
        cifs: move rename and delete-on-close logic into helper function
        cifs: have find_writeable_file prefer filehandles opened by same task
        cifs: don't use GFP_KERNEL with GFP_NOFS
        [CIFS] use common code for turning off ATTR_READONLY in cifs_unlink
        cifs: clean up variables in cifs_unlink
      86ed5a93
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 835a1c09
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (49 commits)
        MIPS: RB532: provide GPIO_BUILTIN_NR and irq_to_gpio/gpio_to_irq
        MIPS: Move ptrace prototypes to ptrace.h
        MIPS: Ptrace support for HARDWARE_WATCHPOINTS
        MIPS: Scheduler support for HARDWARE_WATCHPOINTS.
        MIPS: Watch exception handling for HARDWARE_WATCHPOINTS.
        MIPS: Probe watch registers and report configuration.
        MIPS: Add HARDWARE_WATCHPOINTS definitions and support code.
        MIPS: Add HARDWARE_WATCHPOINTS configure option.
        MIPS: Replace use of <asm-generic/uaccess.h> with native implementations.
        MIPS: TXx9: Add TX4939 ATA support (v2)
        MIPS: Rewrite spinlocks to ticket locks.
        MIPS: IP checksums: Optimize adjust of sum on buffers of odd alignment.
        MIPS: IP checksums: Remove unncessary .set pseudos
        MIPS: IP checksums: Remove unncessary folding of sum to 16 bit.
        MIPS: Move headfiles to new location below arch/mips/include
        MIPS: Alchemy: rename directory
        MIPS: Optimize get_user and put_user for 64-bit
        MIPS: TXx9: Implement prom_free_prom_memory
        MIPS: TXx9: Add RBTX4939 board support
        MIPS: TXx9: Add TX4939 SoC support
        ...
      835a1c09
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.alsa-project.org/alsa-kernel · d3570a5a
      Linus Torvalds authored
      * 'for-linus' of git://git.alsa-project.org/alsa-kernel: (258 commits)
        ALSA: hda: VREF powerdown for headphones
        ALSA: hda: STAC_HP_M4
        ALSA: ASoC: Check for machine type in GTA01 machine driver
        ALSA: mtpav - Fix race in probe
        ALSA: usb-audio: dynamic detection of MIDI interfaces in uaxx-quirk
        ALSA: Add a note on dependency of RTC stuff
        ALSA: ASoC: add new param mux to dapm_mux_update_power
        ALSA: Increase components array size
        ALSA: ASoC: Correct inverted Mic PGA Switch control in wm8510 driver
        ALSA: hda: comment typo fix
        ALSA: hda: comment typo fix
        ALSA: hda - Fix PCI SSID for ASROCK K18N78FullHD-hSLI
        ALSA: snd-usb-audio: support for Edirol UA-4FX device
        ALSA: usb - Fix possible Oops at USB-MIDI disconnection
        ALSA: hda - Fix another ALC889A (rev 0x100101)
        ALSA: hda: add more board-specific information for Realtek ALC662 rev1
        ALSA: Correct Vladimir Barinov's e-mail address
        ALSA: cs46xx: Add PCI IDs for TerraTec and Hercules cards
        ALSA: hda: SPDIF stream muting support
        ALSA: hda: appletv support
        ...
      d3570a5a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 37d9869e
      Linus Torvalds authored
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (27 commits)
        [S390] Fix checkstack for s390
        [S390] fix initialization of stp
        [S390] 3215: Remove tasklet.
        [S390] console flush on panic / reboot
        [S390] introduce dirty bit for kvm live migration
        [S390] Add ioctl support for EMC Symmetrix Subsystem Control I/O
        [S390] xpram: per device block request queues.
        [S390] dasd: fix message flood for unsolicited interrupts
        [S390] Move private simple udelay function to arch/s390/lib/delay.c.
        [S390] dcssblk: add >2G DCSSs support and stacked contiguous DCSSs support.
        [S390] ptrace changes
        [S390] s390: use sys_pause for 31bit pause entry point
        [S390] qdio enhanced SIGA (iqdio) support.
        [S390] cio: fix cio_tpi.
        [S390] cio: Correct use of ! and &
        [S390] cio: inline assembly cleanup
        [S390] bus_id -> dev_set_name() for css and ccw busses
        [S390] bus_id ->dev_name() conversions in qdio
        [S390] Use s390_root_dev_* in kvm_virtio.
        [S390] more bus_id -> dev_name conversions
        ...
      37d9869e
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · 098ef215
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
        [CPUFREQ] Fix BUG: using smp_processor_id() in preemptible code
        [CPUFREQ] Don't export governors for default governor
        [CPUFREQ][6/6] cpufreq: Add idle microaccounting in ondemand governor
        [CPUFREQ][5/6] cpufreq: Changes to get_cpu_idle_time_us(), used by ondemand governor
        [CPUFREQ][4/6] cpufreq_ondemand: Parameterize down differential
        [CPUFREQ][3/6] cpufreq: get_cpu_idle_time() changes in ondemand for idle-microaccounting
        [CPUFREQ][2/6] cpufreq: Change load calculation in ondemand for software coordination
        [CPUFREQ][1/6] cpufreq: Add cpu number parameter to __cpufreq_driver_getavg()
        [CPUFREQ] use deferrable delayed work init in conservative governor
        [CPUFREQ] drivers/cpufreq/cpufreq.c: Adjust error handling code involving cpufreq_cpu_put
        [CPUFREQ] add error handling for cpufreq_register_governor() error
        [CPUFREQ] acpi-cpufreq: add error handling for cpufreq_register_driver() error
        [CPUFREQ] Coding style fixes to arch/x86/kernel/cpu/cpufreq/powernow-k6.c
        [CPUFREQ] Coding style fixes to arch/x86/kernel/cpu/cpufreq/elanfreq.c
      098ef215
    • Florian Fainelli's avatar
      MIPS: RB532: provide GPIO_BUILTIN_NR and irq_to_gpio/gpio_to_irq · 9609e740
      Florian Fainelli authored
      This patchs defines the number of built-in the GPIOs present
      on the SoC as Documentation/gpio.txt recommends to do.
      Define irq_to_gpio/gpio_to_irq to return the right values so that
      it fixes a compilation error on drivers/gpio/gpiolib.c
      when enabling debugfs.
      Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      9609e740
    • Ralf Baechle's avatar
      MIPS: Move ptrace prototypes to ptrace.h · d302d05c
      Ralf Baechle authored
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      d302d05c
    • David Daney's avatar
      MIPS: Ptrace support for HARDWARE_WATCHPOINTS · 0926bf95
      David Daney authored
      This is the final part of the watch register patch.  Here we hook up
      ptrace so that the user space debugger (gdb), can set and read the
      registers.
      Signed-off-by: default avatarDavid Daney <ddaney@avtrex.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      0926bf95
    • David Daney's avatar
      MIPS: Scheduler support for HARDWARE_WATCHPOINTS. · 2c708cba
      David Daney authored
      Here we hook up the scheduler.  Whenever we switch to a new process,
      we check to see if the watch registers should be installed, and do it
      if needed.
      Signed-off-by: default avatarDavid Daney <ddaney@avtrex.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      2c708cba