12 Jun, 2009

7 commits

  • * 'for-linus' of git://git.infradead.org/users/eparis/notify:
    fsnotify: allow groups to set freeing_mark to null
    inotify/dnotify: should_send_event shouldn't match on FS_EVENT_ON_CHILD
    dnotify: do not bother to lock entry->lock when reading mask
    dnotify: do not use ?true:false when assigning to a bool
    fsnotify: move events should indicate the event was on a child
    inotify: reimplement inotify using fsnotify
    fsnotify: handle filesystem unmounts with fsnotify marks
    fsnotify: fsnotify marks on inodes pin them in core
    fsnotify: allow groups to add private data to events
    fsnotify: add correlations between events
    fsnotify: include pathnames with entries when possible
    fsnotify: generic notification queue and waitq
    dnotify: reimplement dnotify using fsnotify
    fsnotify: parent event notification
    fsnotify: add marks to inodes so groups can interpret how to handle those inodes
    fsnotify: unified filesystem notification backend

    Linus Torvalds
     
  • * 'for-linus' of git://linux-arm.org/linux-2.6:
    kmemleak: Add the corresponding MAINTAINERS entry
    kmemleak: Simple testing module for kmemleak
    kmemleak: Enable the building of the memory leak detector
    kmemleak: Remove some of the kmemleak false positives
    kmemleak: Add modules support
    kmemleak: Add kmemleak_alloc callback from alloc_large_system_hash
    kmemleak: Add the vmalloc memory allocation/freeing hooks
    kmemleak: Add the slub memory allocation/freeing hooks
    kmemleak: Add the slob memory allocation/freeing hooks
    kmemleak: Add the slab memory allocation/freeing hooks
    kmemleak: Add documentation on the memory leak detector
    kmemleak: Add the base support

    Manual conflict resolution (with the slab/earlyboot changes) in:
    drivers/char/vt.c
    init/main.c
    mm/slab.c

    Linus Torvalds
     
  • …el/git/tip/linux-2.6-tip

    * 'perfcounters-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (574 commits)
    perf_counter: Turn off by default
    perf_counter: Add counter->id to the throttle event
    perf_counter: Better align code
    perf_counter: Rename L2 to LL cache
    perf_counter: Standardize event names
    perf_counter: Rename enums
    perf_counter tools: Clean up u64 usage
    perf_counter: Rename perf_counter_limit sysctl
    perf_counter: More paranoia settings
    perf_counter: powerpc: Implement generalized cache events for POWER processors
    perf_counters: powerpc: Add support for POWER7 processors
    perf_counter: Accurate period data
    perf_counter: Introduce struct for sample data
    perf_counter tools: Normalize data using per sample period data
    perf_counter: Annotate exit ctx recursion
    perf_counter tools: Propagate signals properly
    perf_counter tools: Small frequency related fixes
    perf_counter: More aggressive frequency adjustment
    perf_counter/x86: Fix the model number of Intel Core2 processors
    perf_counter, x86: Correct some event and umask values for Intel processors
    ...

    Linus Torvalds
     
  • Reimplement inotify_user using fsnotify. This should be feature for feature
    exactly the same as the original inotify_user. This does not make any changes
    to the in kernel inotify feature used by audit. Those patches (and the eventual
    removal of in kernel inotify) will come after the new inotify_user proves to be
    working correctly.

    Signed-off-by: Eric Paris
    Acked-by: Al Viro
    Cc: Christoph Hellwig

    Eric Paris
     
  • Reimplement dnotify using fsnotify.

    Signed-off-by: Eric Paris
    Acked-by: Al Viro
    Cc: Christoph Hellwig

    Eric Paris
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (26 commits)
    amd64_edac: add MAINTAINERS entry
    EDAC: do not enable modules by default
    amd64_edac: do not enable module by default
    amd64_edac: add module registration routines
    amd64_edac: add ECC reporting initializers
    amd64_edac: add EDAC core-related initializers
    amd64_edac: add error decoding logic
    amd64_edac: add ECC chipkill syndrome mapping table
    amd64_edac: add per-family descriptors
    amd64_edac: add F10h-and-later methods-p3
    amd64_edac: add F10h-and-later methods-p2
    amd64_edac: add F10h-and-later methods-p1
    amd64_edac: add k8-specific methods
    amd64_edac: assign DRAM chip select base and mask in a family-specific way
    amd64_edac: add helper to dump relevant registers
    amd64_edac: add DRAM address type conversion facilities
    amd64_edac: add functionality to compute the DRAM hole
    amd64_edac: add sys addr to memory controller mapping helpers
    amd64_edac: add memory scrubber interface
    amd64_edac: add MCA error types
    ...

    Linus Torvalds
     
  • Signed-off-by: Catalin Marinas

    Catalin Marinas
     

11 Jun, 2009

2 commits


10 Jun, 2009

1 commit


07 Jun, 2009

1 commit


01 Jun, 2009

3 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
    3c509: Add missing EISA IDs
    MAINTAINERS: take maintainership of the cpmac Ethernet driver
    net/firmare: Ignore .cis files
    ath1e: add new device id for asus hardware
    mlx4_en: Fix a kernel panic when waking tx queue
    rtl8187: add USB ID for Linksys WUSB54GC-EU v2 USB wifi dongle
    at76c50x-usb: avoid mutex deadlock in at76_dwork_hw_scan
    mac8390: fix build with NET_POLL_CONTROLLER
    cxgb3: link fault fixes
    cxgb3: fix dma mapping regression
    netfilter: nfnetlink_log: fix wrong skbuff size calculation
    netfilter: xt_hashlimit does a wrong SEQ_SKIP
    bfin_mac: fix build error due to net_device_ops convert
    atlx: move modinfo data from atlx.h to atl1.c
    gianfar: fix babbling rx error event bug
    cls_cgroup: read classid atomically in classifier
    netfilter: nf_ct_dccp: add missing DCCP protocol changes in event cache
    netfilter: nf_ct_tcp: fix accepting invalid RST segments

    Linus Torvalds
     
  • This patch adds me as the maintainer of the CPMAC (AR7)
    Ethernet driver.

    Signed-off-by: Florian Fainelli
    Signed-off-by: David S. Miller

    Florian Fainelli
     
  • Merge reason: merge almost-rc8 into perfcounters/core, which was -rc6
    based - to pick up the latest upstream fixes.

    Signed-off-by: Ingo Molnar

    Ingo Molnar
     

30 May, 2009

2 commits

  • * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
    fsldma: Fix compile warnings
    fsldma: fix memory leak on error path in fsl_dma_prep_memcpy()
    fsldma: snooping is not enabled for last entry in descriptor chain
    fsldma: fix infinite loop on multi-descriptor DMA chain completion
    fsldma: fix "DMA halt timeout!" errors
    fsldma: fix check on potential fdev->chan[] overflow
    fsldma: update mailling list address in MAINTAINERS

    Linus Torvalds
     
  • * master.kernel.org:/home/rmk/linux-2.6-arm:
    [ARM] update mach-types
    [ARM] Add cmpxchg support for ARMv6+ systems (v5)
    [ARM] barriers: improve xchg, bitops and atomic SMP barriers
    Gemini: Fix SRAM/ROM location after memory swap
    MAINTAINER: Add F: entries for Gemini and FA526
    [ARM] disable NX support for OABI-supporting kernels
    [ARM] add coherent DMA mask for mv643xx_eth
    [ARM] pxa/palm: fix PalmLD/T5/TX AC97 MFP
    [ARM] pxa: add parameter to clksrc_read() for pxa168/910
    [ARM] pxa: fix the incorrectly defined drive strength macros for pxa{168,910}
    [ARM] Orion: Remove explicit name for platform device resources
    [ARM] Kirkwood: Correct MPP for SATA activity/presence LEDs of QNAP TS-119/TS-219.
    [ARM] pxa/ezx: fix pin configuration for low power mode
    [ARM] pxa/spitz: provide spitz_ohci_exit() that unregisters USB_HOST GPIO
    [ARM] pxa: enable GPIO receivers after configuring pins
    [ARM] pxa: allow gpio_reset drive high during normal work
    [ARM] pxa: save/restore PGSR on suspend/resume.

    Linus Torvalds
     

29 May, 2009

2 commits


28 May, 2009

1 commit


27 May, 2009

2 commits


24 May, 2009

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
    [SCSI] mpt2sas: fix driver version inconsistency
    [SCSI] 3w-xxxx: scsi_dma_unmap fix
    [SCSI] 3w-9xxx: scsi_dma_unmap fix
    [SCSI] ses: fix problems caused by empty SES provided name
    [SCSI] fc-transport: Close state transition-window during rport deletion.
    [SCSI] initialize max_target_blocked in scsi_alloc_target
    [SCSI] fnic: Add new Cisco PCI-Express FCoE HBA

    Linus Torvalds
     

22 May, 2009

2 commits


18 May, 2009

1 commit


14 May, 2009

1 commit


05 May, 2009

1 commit


03 May, 2009

3 commits

  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
    ocfs2: Change repository in MAINTAINERS.
    ocfs2: Fix a missing credit when deleting from indexed directories.
    ocfs2/trivial: Remove unused variable in ocfs2_rename.
    ocfs2: Add missing iput() during error handling in ocfs2_dentry_attach_lock()
    ocfs2: Fix some printk() warnings.
    ocfs2: Fix 2 warning during ocfs2 make.
    ocfs2: Reserve 1 more cluster in expanding_inline_dir for indexed dir.

    Linus Torvalds
     
  • Add Roland and Oleg as formal ptrace maintainers, they've been doing the
    job for a while.

    Includes the file patterns requested by Joe.

    Signed-off-by: Christoph Hellwig
    Acked-by: Roland McGrath
    Cc: Oleg Nesterov
    Cc: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christoph Hellwig
     
  • I will finish school soon, so replace my student address with this one.

    Signed-off-by: Florian Fainelli
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Florian Fainelli
     

01 May, 2009

2 commits


29 Apr, 2009

2 commits


24 Apr, 2009

5 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
    MAINTAINERS: update IDE entry
    palm_bk3710: palm_bk3710_udmatimings[] CodingStyle fixup
    palm_bk3710: those registers/bitfields don't exist
    mediabay: fix build for CONFIG_BLOCK=n
    ide: Stop disks on reboot for laptop which cuts power
    ide-cd: fix kernel crash on hppa regression
    palm_bk3710: UDMA performance fix

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (94 commits)
    netfilter: ctnetlink: fix gcc warning during compilation
    net/netrom: Fix socket locking
    netlabel: Always remove the correct address selector
    ucc_geth.c: Fix upsmr setting in RMII mode
    8139too: fix HW initial flow
    af_iucv: Fix race when queuing incoming iucv messages
    af_iucv: Test additional sk states in iucv_sock_shutdown
    af_iucv: Reject incoming msgs if RECV_SHUTDOWN is set
    af_iucv: fix oops in iucv_sock_recvmsg() for MSG_PEEK flag
    af_iucv: consider state IUCV_CLOSING when closing a socket
    iwlwifi: DMA fixes
    iwlwifi: add debugging for TX path
    mwl8: fix build warning.
    mac80211: fix alignment calculation bug
    mac80211: do not print WARN if config interface
    iwl3945: use cancel_delayed_work_sync to cancel rfkill_poll
    iwlwifi: fix EEPROM validation mask to include OTP only devices
    atmel: fix netdev ops conversion
    pcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM
    mlx4_en: Fix cleanup if workqueue create in mlx4_en_add() fails
    ...

    Linus Torvalds
     
  • * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
    powerpc: Fix modular build of ide-pmac when mediabay is built in
    powerpc/pasemi: Fix build error on UP
    powerpc: Make macintosh/mediabay driver depend on CONFIG_BLOCK
    maintainers: Fix PS3 patterns
    powerpc/ps3: Fix CONFIG_PS3_FLASH=n build warning
    powerpc/32: Don't clobber personality flags on exec
    powerpc: Fix crash on CPU hotplug
    powerpc/85xx: Remove defconfigs that mpc85xx_{smp_}defconfig cover
    powerpc/85xx: Added SMP defconfig
    powerpc/85xx: Enabled a bunch of FSL specific drivers/options
    powerpc/85xx: Updated generic mpc85xx_defconfig
    powerpc: don't disable SATA interrupts on Freescale MPC8610 HPCD
    fsl_rio: Pass the proper device to dma mapping routines
    powerpc: Fix of_node_put() exit path in of_irq_map_one()
    powerpc/5200: defconfig updates
    powerpc/5200: Add FLASH nodes to lite5200 device tree
    powerpc/device-tree: Document MTD nodes with multiple "reg" tuples
    powerpc/of-device-tree: Factor MTD physmap bindings out of booting-without-of
    powerpc/5200: Bring the legacy fsl_spi_platform_data hooks back

    Linus Torvalds
     
  • Update the git tree URL for the PowerPC 4xx git tree.

    Reported-by: Denis ChengRq
    Signed-off-by: Josh Boyer

    Josh Boyer
     
  • By a popular demand quilt tree was replaced by a git one.

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     

22 Apr, 2009

1 commit

  • Correct the MAINTAINERS file patterns for PS3. Removes some PS3
    patterns that were under 'CELL BROADBAND ENGINE ARCHITECTURE', and
    adds missing PS3 sound and RTC driver patterns.

    CC: Arnd Bergmann
    Signed-off-by: Geoff Levand
    Signed-off-by: Paul Mackerras

    Geoff Levand