1. 05 10月, 2006 32 次提交
  2. 04 10月, 2006 8 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · d002ec48
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [XFRM]: BEET mode
        [TCP]: Kill warning in tcp_clean_rtx_queue().
        [NET_SCHED]: Remove old estimator implementation
        [ATM]: [zatm] always *pcr in alloc_shaper()
        [ATM]: [ambassador] Change the return type to reflect reality
        [ATM]: kmalloc to kzalloc patches for drivers/atm
        [TIPC]: fix printk warning
        [XFRM]: Clearing xfrm_policy_count[] to zero during flush is incorrect.
        [XFRM] STATE: Use destination address for src hash.
        [NEIGH]: always use hash_mask under tbl lock
        [UDP]: Fix MSG_PROBE crash
        [UDP6]: Fix flowi clobbering
        [NET_SCHED]: Revert "HTB: fix incorrect use of RB_EMPTY_NODE"
        [NETFILTER]: ebt_mark: add or/and/xor action support to mark target
        [NETFILTER]: ipt_REJECT: remove largely duplicate route_reverse function
        [NETFILTER]: Honour source routing for LVS-NAT
        [NETFILTER]: add type parameter to ip_route_me_harder
        [NETFILTER]: Kconfig: fix xt_physdev dependencies
      d002ec48
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6 · 5a96c5d0
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6: (41 commits)
        [PARISC] Kill wall_jiffies use
        [PARISC] Honour "panic_on_oops" sysctl
        [PARISC] Fix fs/binfmt_som.c
        [PARISC] Export clear_user_page to modules
        [PARISC] Make DMA routines more stubby
        [PARISC] Define pci_get_legacy_ide_irq
        [PARISC] Fix CONFIG_DEBUG_SPINLOCK
        [PARISC] Fix HPUX compat compile with current GCC
        [PARISC] Fix iounmap compile warning
        [PARISC] Add support for Quicksilver AGPGART
        [PARISC] Move LBA and SBA register defines to the common ropes.h
        [PARISC] Create shared <asm/ropes.h> header
        [PARISC] Stash the lba_device in its struct device drvdata
        [PARISC] Generalize IS_ASTRO et al to take a parisc_device like
        [PARISC] Pretty print the name of the lba type on kernel boot
        [PARISC] Remove some obsolete comments and I checked that Reo is similar to Ike
        [PARISC] Add hardware found in the rp8400
        [PARISC] Allow nested interrupts
        [PARISC] Further updates to timer_interrupt()
        [PARISC] remove halftick and copy clocktick to local var (gcc can optimize usage)
        ...
      5a96c5d0
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 13bbd8d9
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (25 commits)
        [POWERPC] Add support for the mpc832x mds board
        [POWERPC] Add initial support for the e300c2 core
        [POWERPC] Add MPC8360EMDS default dts file
        [POWERPC] Add MPC8360EMDS board support
        [POWERPC] Add QUICC Engine (QE) infrastructure
        [POWERPC] Add QE device tree node definition
        [POWERPC] Don't try to just continue if xmon has no input device
        [POWERPC] Fix a printk in pseries_mpic_init_IRQ
        [POWERPC] Get default baud rate in udbg_scc
        [POWERPC] Fix zImage.coff on oldworld PowerMac
        [POWERPC] Fix xmon=off and cleanup xmon initialisation
        [POWERPC] Cleanup include/asm-powerpc/xmon.h
        [POWERPC] Update swim3 printk after blkdev.h change
        [POWERPC] Cell interrupt rework
        POWERPC: mpc82xx merge: board-specific/platform stuff(resend)
        POWERPC: 8272ads merge to powerpc: common stuff
        POWERPC: Added devicetree for mpc8272ads board
        [POWERPC] iSeries has no legacy I/O
        [POWERPC] implement BEGIN/END_FW_FTR_SECTION
        [POWERPC] iSeries does not need pcibios_fixup_resources
        ...
      13bbd8d9
    • L
      Merge branch 'audit.b32' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current · 18e6756a
      Linus Torvalds 提交于
      * 'audit.b32' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
        [PATCH] message types updated
        [PATCH] name_count array overrun
        [PATCH] PPID filtering fix
        [PATCH] arch filter lists with < or > should not be accepted
      18e6756a
    • A
      [PATCH] pata: teach ali about rev C8, keep pcmcia driver in sync · a0a00cbf
      Alan Cox 提交于
      This fixes support for rev c8 of the ALi/ULi PATA, and keeps pcmcia in
      sync so ide_cs and pata_pcmcia are interchangable, both are only changes
      to constants.
      
      Right now rev 0xC8 and higher don't work with libata but 0xc8 is in the
      field now.
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      a0a00cbf
    • J
      [PATCH] RTC: build fixes · 11966adc
      Jeff Garzik 提交于
      Fix obvious build breakage revealed by 'make allyesconfig'
      in current -git.
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      11966adc
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · e30fdb1e
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        [libata] pata_artop: kill gcc warning
        [PATCH] libata: turn off NCQ if queue depth is adjusted to 1
        [PATCH] libata: cosmetic changes to constants
        [libata] DocBook minor updates, fixes
        [libata] PCI ID table cleanup in various drivers
        [libata] Print out Status register, if a BSY-sleep takes too long
        [libata] init probe_ent->private_data in a common location
        [libata] minor PCI IDE probe fixes and cleanups
        [libata] Use new PCI_VDEVICE() macro to dramatically shorten ID lists
        [PATCH] Fix reference of uninitialised memory in ata_device_add()
      e30fdb1e
    • A
      [PATCH] git-powerpc: wrapper: don't require execute permissions · 5b9b5572
      Andrew Morton 提交于
      If you lose the x bit (eg: by using patch(1)), powerpc won't build.  Be
      defensive about it...
      
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      5b9b5572