1. 20 Jun, 2006 40 commits
    • Linus Torvalds's avatar
      Merge branch 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current · d9eaec9e
      Linus Torvalds authored
      * 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: (25 commits)
        [PATCH] make set_loginuid obey audit_enabled
        [PATCH] log more info for directory entry change events
        [PATCH] fix AUDIT_FILTER_PREPEND handling
        [PATCH] validate rule fields' types
        [PATCH] audit: path-based rules
        [PATCH] Audit of POSIX Message Queue Syscalls v.2
        [PATCH] fix se_sen audit filter
        [PATCH] deprecate AUDIT_POSSBILE
        [PATCH] inline more audit helpers
        [PATCH] proc_loginuid_write() uses simple_strtoul() on non-terminated array
        [PATCH] update of IPC audit record cleanup
        [PATCH] minor audit updates
        [PATCH] fix audit_krule_to_{rule,data} return values
        [PATCH] add filtering by ppid
        [PATCH] log ppid
        [PATCH] collect sid of those who send signals to auditd
        [PATCH] execve argument logging
        [PATCH] fix deadlocks in AUDIT_LIST/AUDIT_LIST_RULES
        [PATCH] audit_panic() is audit-internal
        [PATCH] inotify (5/5): update kernel documentation
        ...
      
      Manual fixup of conflict in unclude/linux/inotify.h
      d9eaec9e
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/hdrcleanup-2.6 · cee4cca7
      Linus Torvalds authored
      * git://git.infradead.org/hdrcleanup-2.6: (63 commits)
        [S390] __FD_foo definitions.
        Switch to __s32 types in joystick.h instead of C99 types for consistency.
        Add <sys/types.h> to headers included for userspace in <linux/input.h>
        Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
        Remove struct fddi_statistics from user view in <linux/if_fddi.h>
        Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
        Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
        Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>
        Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too
        Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>
        Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>
        Use __uXX types in <linux/divert.h> for struct divert_blk et al.
        Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.
        Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
        Use __uXX types in user-visible structures in <linux/nbd.h>
        Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
        Use __uXX types for S390 DASD volume label definitions which are user-visible
        S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
        Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>
        Fix private integer types used in V4L2 ioctls.
        ...
      
      Manually resolve conflict in include/linux/mtd/physmap.h
      cee4cca7
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/~dwmw2/rbtree-2.6 · 2edc322d
      Linus Torvalds authored
      * git://git.infradead.org/~dwmw2/rbtree-2.6:
        [RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency
        Update UML kernel/physmem.c to use rb_parent() accessor macro
        [RBTREE] Update hrtimers to use rb_parent() accessor macro.
        [RBTREE] Add explicit alignment to sizeof(long) for struct rb_node.
        [RBTREE] Merge colour and parent fields of struct rb_node.
        [RBTREE] Remove dead code in rb_erase()
        [RBTREE] Update JFFS2 to use rb_parent() accessor macro.
        [RBTREE] Update eventpoll.c to use rb_parent() accessor macro.
        [RBTREE] Update key.c to use rb_parent() accessor macro.
        [RBTREE] Update ext3 to use rb_parent() accessor macro.
        [RBTREE] Change rbtree off-tree marking in I/O schedulers.
        [RBTREE] Add accessor macros for colour and parent fields of rb_node
      2edc322d
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · be967b7e
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (199 commits)
        [MTD] NAND: Fix breakage all over the place
        [PATCH] NAND: fix remaining OOB length calculation
        [MTD] NAND Fixup NDFC merge brokeness
        [MTD NAND] S3C2410 driver cleanup
        [MTD NAND] s3c24x0 board: Fix clock handling, ensure proper initialisation.
        [JFFS2] Check CRC32 on dirent and data nodes each time they're read
        [JFFS2] When retiring nextblock, allocate a node_ref for the wasted space
        [JFFS2] Mark XATTR support as experimental, for now
        [JFFS2] Don't trust node headers before the CRC is checked.
        [MTD] Restore MTD_ROM and MTD_RAM types
        [MTD] assume mtd->writesize is 1 for NOR flashes
        [MTD NAND] Fix s3c2410 NAND driver so it at least _looks_ like it compiles
        [MTD] Prepare physmap for 64-bit-resources
        [JFFS2] Fix more breakage caused by janitorial meddling.
        [JFFS2] Remove stray __exit from jffs2_compressors_exit()
        [MTD] Allow alternate JFFS2 mount variant for root filesystem.
        [MTD] Disconnect struct mtd_info from ABI
        [MTD] replace MTD_RAM with MTD_GENERIC_TYPE
        [MTD] replace MTD_ROM with MTD_GENERIC_TYPE
        [MTD] remove a forgotten MTD_XIP
        ...
      be967b7e
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-serial · eef11427
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-serial:
        [SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI
      eef11427
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-mmc · c9ab0971
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-mmc:
        [MMC] Add (MMC) to entry in MAINTAINERS file
        [MMC] sdhci truncated pointer fix
      c9ab0971
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · ff914453
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits)
        [ARM] 3559/1: S3C2442: core and serial port
        [ARM] 3557/1: S3C24XX: centralise and cleanup uart registration
        [ARM] 3558/1: SMDK24XX: LED platform devices
        [ARM] 3534/1: add spi support to lubbock platform
        [ARM] 3554/1: ARM: Fix dyntick locking
        [ARM] 3553/1: S3C24XX: earlier print of cpu idcode info
        [ARM] 3552/1: S3C24XX: Move VA of GPIO for low-level debug
        [ARM] 3551/1: S3C24XX: PM code failes to compile with CONFIG_DCACHE_WRITETHROUGH
        [ARM] 3550/1: OSIRIS: fix serial port map for 1:1
        [ARM] 3548/1: Fix the ARMv6 CPU id in compressed/head.S
        [ARM] 3335/1: Old-abi Thumb sys_syscall broken
        [ARM] 3467/1: [3/3] Support for Philips PNX4008 platform: defconfig
        [ARM] 3466/1: [2/3] Support for Philips PNX4008 platform: chip support
        [ARM] 3465/1: [1/3] Support for Philips PNX4008 platform: headers
        [ARM] 3407/1: lpd7x: documetation update
        [ARM] 3406/1: lpd7x: compilation fix for smc91x
        [ARM] 3405/1: lpd7a40x: CPLD ssp driver
        [ARM] 3404/1: lpd7a40x: AMBA CLCD support
        [ARM] 3403/1: lpd7a40x: updated default configurations
        [ARM] 3402/1: lpd7a40x: serial driver bug fix
        ...
      ff914453
    • Thomas Gleixner's avatar
      [MTD] NAND: Fix breakage all over the place · 7bc3312b
      Thomas Gleixner authored
      Following problems are addressed:
      
      - wrong status caused early break out of nand_wait()
      - removed the bogus status check in nand_wait() which
        is a relict of the abandoned support for interrupted
        erase.
      - status check moved to the correct place in read_oob
      - oob support for syndrom based ecc with strange layouts
      - use given offset in the AUTOOOB based oob operations
      
      Partially based on a patch from Vitaly Vool <vwool@ru.mvista.com>
      Thanks to Savin Zlobec <savin@epico.si> for tracking down the
      status problem.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      7bc3312b
    • Vitaly Wool's avatar
      [PATCH] NAND: fix remaining OOB length calculation · 7e4178f9
      Vitaly Wool authored
      In nand_read_page_syndrome/nand_write_page_syndrome the calculation of
      the remaining oob length which is not used by the prepad/ecc/postpad
      areas is wrong.
      Signed-off-by: default avatarVitaly Wool <vwool@ru.mvista.com>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      7e4178f9
    • Thomas Gleixner's avatar
      [MTD] NAND Fixup NDFC merge brokeness · b6d5ee00
      Thomas Gleixner authored
      Remove the remains of a broken merge.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      b6d5ee00
    • Steve Grubb's avatar
      [PATCH] make set_loginuid obey audit_enabled · 41757106
      Steve Grubb authored
      Hi,
      
      I was doing some testing and noticed that when the audit system was disabled,
      I was still getting messages about the loginuid being set. The following patch
      makes audit_set_loginuid look at in_syscall to determine if it should create
      an audit event. The loginuid will continue to be set as long as there is a context.
      Signed-off-by: default avatarSteve Grubb <sgrubb@redhat.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      41757106
    • Amy Griffis's avatar
      [PATCH] log more info for directory entry change events · 9c937dcc
      Amy Griffis authored
      When an audit event involves changes to a directory entry, include
      a PATH record for the directory itself.  A few other notable changes:
      
          - fixed audit_inode_child() hooks in fsnotify_move()
          - removed unused flags arg from audit_inode()
          - added audit log routines for logging a portion of a string
      
      Here's some sample output.
      
      before patch:
      type=SYSCALL msg=audit(1149821605.320:26): arch=40000003 syscall=39 success=yes exit=0 a0=bf8d3c7c a1=1ff a2=804e1b8 a3=bf8d3c7c items=1 ppid=739 pid=800 auid=0 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=ttyS0 comm="mkdir" exe="/bin/mkdir" subj=root:system_r:unconfined_t:s0-s0:c0.c255
      type=CWD msg=audit(1149821605.320:26):  cwd="/root"
      type=PATH msg=audit(1149821605.320:26): item=0 name="foo" parent=164068 inode=164010 dev=03:00 mode=040755 ouid=0 ogid=0 rdev=00:00 obj=root:object_r:user_home_t:s0
      
      after patch:
      type=SYSCALL msg=audit(1149822032.332:24): arch=40000003 syscall=39 success=yes exit=0 a0=bfdd9c7c a1=1ff a2=804e1b8 a3=bfdd9c7c items=2 ppid=714 pid=777 auid=0 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=ttyS0 comm="mkdir" exe="/bin/mkdir" subj=root:system_r:unconfined_t:s0-s0:c0.c255
      type=CWD msg=audit(1149822032.332:24):  cwd="/root"
      type=PATH msg=audit(1149822032.332:24): item=0 name="/root" inode=164068 dev=03:00 mode=040750 ouid=0 ogid=0 rdev=00:00 obj=root:object_r:user_home_dir_t:s0
      type=PATH msg=audit(1149822032.332:24): item=1 name="foo" inode=164010 dev=03:00 mode=040755 ouid=0 ogid=0 rdev=00:00 obj=root:object_r:user_home_t:s0
      Signed-off-by: default avatarAmy Griffis <amy.griffis@hp.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      9c937dcc
    • Amy Griffis's avatar
      [PATCH] fix AUDIT_FILTER_PREPEND handling · 6a2bceec
      Amy Griffis authored
      Clear AUDIT_FILTER_PREPEND flag after adding rule to list.  This
      fixes three problems when a rule is added with the -A syntax:
      
          - auditctl displays filter list as "(null)"
          - the rule cannot be removed using -d
          - a duplicate rule can be added with -a
      Signed-off-by: default avatarAmy Griffis <amy.griffis@hp.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      6a2bceec
    • Al Viro's avatar
      [PATCH] validate rule fields' types · 0a73dccc
      Al Viro authored
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      0a73dccc
    • Amy Griffis's avatar
      [PATCH] audit: path-based rules · f368c07d
      Amy Griffis authored
      In this implementation, audit registers inotify watches on the parent
      directories of paths specified in audit rules.  When audit's inotify
      event handler is called, it updates any affected rules based on the
      filesystem event.  If the parent directory is renamed, removed, or its
      filesystem is unmounted, audit removes all rules referencing that
      inotify watch.
      
      To keep things simple, this implementation limits location-based
      auditing to the directory entries in an existing directory.  Given
      a path-based rule for /foo/bar/passwd, the following table applies:
      
          passwd modified -- audit event logged
          passwd replaced -- audit event logged, rules list updated
          bar renamed     -- rule removed
          foo renamed     -- untracked, meaning that the rule now applies to
      		       the new location
      
      Audit users typically want to have many rules referencing filesystem
      objects, which can significantly impact filtering performance.  This
      patch also adds an inode-number-based rule hash to mitigate this
      situation.
      
      The patch is relative to the audit git tree:
      http://kernel.org/git/?p=linux/kernel/git/viro/audit-current.git;a=summary
      and uses the inotify kernel API:
      http://lkml.org/lkml/2006/6/1/145Signed-off-by: default avatarAmy Griffis <amy.griffis@hp.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      f368c07d
    • George C. Wilson's avatar
      [PATCH] Audit of POSIX Message Queue Syscalls v.2 · 20ca73bc
      George C. Wilson authored
      This patch adds audit support to POSIX message queues.  It applies cleanly to
      the lspp.b15 branch of Al Viro's git tree.  There are new auxiliary data
      structures, and collection and emission routines in kernel/auditsc.c.  New hooks
      in ipc/mqueue.c collect arguments from the syscalls.
      
      I tested the patch by building the examples from the POSIX MQ library tarball.
      Build them -lrt, not against the old MQ library in the tarball.  Here's the URL:
      http://www.geocities.com/wronski12/posix_ipc/libmqueue-4.41.tar.gz
      Do auditctl -a exit,always -S for mq_open, mq_timedsend, mq_timedreceive,
      mq_notify, mq_getsetattr.  mq_unlink has no new hooks.  Please see the
      corresponding userspace patch to get correct output from auditd for the new
      record types.
      
      [fixes folded]
      Signed-off-by: default avatarGeorge Wilson <ltcgcw@us.ibm.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      20ca73bc
    • Darrel Goeddel's avatar
      [PATCH] fix se_sen audit filter · 8ba8e0fb
      Darrel Goeddel authored
      Fix a broken comparison that causes the process clearance to be checked for
      both se_clr and se_sen audit filters.
      Signed-off-by: default avatarDarrel Goeddel <dgoeddel@trustedcs.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      8ba8e0fb
    • Al Viro's avatar
      [PATCH] deprecate AUDIT_POSSBILE · 014149cc
      Al Viro authored
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      014149cc
    • Al Viro's avatar
      [PATCH] inline more audit helpers · d8945bb5
      Al Viro authored
      pull checks for ->audit_context into inlined wrappers
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      d8945bb5
    • Al Viro's avatar
    • Linda Knippers's avatar
      [PATCH] update of IPC audit record cleanup · ac03221a
      Linda Knippers authored
      The following patch addresses most of the issues with the IPC_SET_PERM
      records as described in:
      https://www.redhat.com/archives/linux-audit/2006-May/msg00010.html
      and addresses the comments I received on the record field names.
      
      To summarize, I made the following changes:
      
      1. Changed sys_msgctl() and semctl_down() so that an IPC_SET_PERM
         record is emitted in the failure case as well as the success case.
         This matches the behavior in sys_shmctl().  I could simplify the
         code in sys_msgctl() and semctl_down() slightly but it would mean
         that in some error cases we could get an IPC_SET_PERM record
         without an IPC record and that seemed odd.
      
      2. No change to the IPC record type, given no feedback on the backward
         compatibility question.
      
      3. Removed the qbytes field from the IPC record.  It wasn't being
         set and when audit_ipc_obj() is called from ipcperms(), the
         information isn't available.  If we want the information in the IPC
         record, more extensive changes will be necessary.  Since it only
         applies to message queues and it isn't really permission related, it
         doesn't seem worth it.
      
      4. Removed the obj field from the IPC_SET_PERM record.  This means that
         the kern_ipc_perm argument is no longer needed.
      
      5. Removed the spaces and renamed the IPC_SET_PERM field names.  Replaced iuid and
         igid fields with ouid and ogid in the IPC record.
      
      I tested this with the lspp.22 kernel on an x86_64 box.  I believe it
      applies cleanly on the latest kernel.
      
      -- ljk
      Signed-off-by: default avatarLinda Knippers <linda.knippers@hp.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      ac03221a
    • Serge E. Hallyn's avatar
      [PATCH] minor audit updates · 5d136a01
      Serge E. Hallyn authored
      Just a few minor proposed updates.  Only the last one will
      actually affect behavior.  The rest are just misleading
      code.
      
      Several AUDIT_SET functions return 'old' value, but only
      return value <0 is checked for.  So just return 0.
      
      propagate audit_set_rate_limit and audit_set_backlog_limit
      error values
      
      In audit_buffer_free, the audit_freelist_count was being
      incremented even when we discard the return buffer, so
      audit_freelist_count can end up wrong.  This could cause
      the actual freelist to shrink over time, eventually
      threatening to degrate audit performance.
      Signed-off-by: default avatarSerge E. Hallyn <serue@us.ibm.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      5d136a01
    • Amy Griffis's avatar
      [PATCH] fix audit_krule_to_{rule,data} return values · 0a3b483e
      Amy Griffis authored
      Don't return -ENOMEM when callers of these functions are checking for
      a NULL return.  Bug noticed by Serge Hallyn.
      Signed-off-by: default avatarAmy Griffis <amy.griffis@hp.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      0a3b483e
    • Al Viro's avatar
      [PATCH] add filtering by ppid · 3c66251e
      Al Viro authored
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      3c66251e
    • Al Viro's avatar
      [PATCH] log ppid · f46038ff
      Al Viro authored
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      f46038ff
    • Al Viro's avatar
      e1396065
    • Al Viro's avatar
      [PATCH] execve argument logging · 473ae30b
      Al Viro authored
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      473ae30b
    • Al Viro's avatar
      [PATCH] fix deadlocks in AUDIT_LIST/AUDIT_LIST_RULES · 9044e6bc
      Al Viro authored
      We should not send a pile of replies while holding audit_netlink_mutex
      since we hold the same mutex when we receive commands.  As the result,
      we can get blocked while sending and sit there holding the mutex while
      auditctl is unable to send the next command and get around to receiving
      what we'd sent.
      
      Solution: create skb and put them into a queue instead of sending;
      once we are done, send what we've got on the list.  The former can
      be done synchronously while we are handling AUDIT_LIST or AUDIT_LIST_RULES;
      we are holding audit_netlink_mutex at that point.  The latter is done
      asynchronously and without messing with audit_netlink_mutex.
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      9044e6bc
    • Al Viro's avatar
      [PATCH] audit_panic() is audit-internal · bc0f3b8e
      Al Viro authored
      ... no need to provide a stub; note that extern is already gone from
      include/linux/audit.h
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      bc0f3b8e
    • Amy Griffis's avatar
      [PATCH] inotify (5/5): update kernel documentation · 0edce197
      Amy Griffis authored
      Update kernel documentation to include a description of the inotify
      kernel API.
      Signed-off-by: default avatarAmy Griffis <amy.griffis@hp.com>
      Acked-by: default avatarRobert Love <rml@novell.com>
      Acked-by: default avatarJohn McCutchan <john@johnmccutchan.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      0edce197
    • Amy Griffis's avatar
      [PATCH] inotify (4/5): allow watch removal from event handler · 3ca10067
      Amy Griffis authored
      Allow callers to remove watches from their event handler via
      inotify_remove_watch_locked().  This functionality can be used to
      achieve IN_ONESHOT-like functionality for a subset of events in the
      mask.
      Signed-off-by: default avatarAmy Griffis <amy.griffis@hp.com>
      Acked-by: default avatarRobert Love <rml@novell.com>
      Acked-by: default avatarJohn McCutchan <john@johnmccutchan.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      3ca10067
    • Amy Griffis's avatar
      [PATCH] inotify (3/5): add interfaces to kernel API · a9dc971d
      Amy Griffis authored
      Add inotify_init_watch() so caller can use inotify_watch refcounts
      before calling inotify_add_watch().
      
      Add inotify_find_watch() to find an existing watch for an (ih,inode)
      pair.  This is similar to inotify_find_update_watch(), but does not
      update the watch's mask if one is found.
      
      Add inotify_rm_watch() to remove a watch via the watch pointer instead
      of the watch descriptor.
      Signed-off-by: default avatarAmy Griffis <amy.griffis@hp.com>
      Acked-by: default avatarRobert Love <rml@novell.com>
      Acked-by: default avatarJohn McCutchan <john@johnmccutchan.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      a9dc971d
    • Amy Griffis's avatar
      [PATCH] inotify (2/5): add name's inode to event handler · 7c297722
      Amy Griffis authored
      When an inotify event includes a dentry name, also include the inode
      associated with that name.
      Signed-off-by: default avatarAmy Griffis <amy.griffis@hp.com>
      Acked-by: default avatarRobert Love <rml@novell.com>
      Acked-by: default avatarJohn McCutchan <john@johnmccutchan.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      7c297722
    • Amy Griffis's avatar
      [PATCH] inotify (1/5): split kernel API from userspace support · 2d9048e2
      Amy Griffis authored
      The following series of patches introduces a kernel API for inotify,
      making it possible for kernel modules to benefit from inotify's
      mechanism for watching inodes.  With these patches, inotify will
      maintain for each caller a list of watches (via an embedded struct
      inotify_watch), where each inotify_watch is associated with a
      corresponding struct inode.  The caller registers an event handler and
      specifies for which filesystem events their event handler should be
      called per inotify_watch.
      Signed-off-by: default avatarAmy Griffis <amy.griffis@hp.com>
      Acked-by: default avatarRobert Love <rml@novell.com>
      Acked-by: default avatarJohn McCutchan <john@johnmccutchan.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      2d9048e2
    • Al Viro's avatar
      [PATCH] remove config.h from inotify.h · 90204e0b
      Al Viro authored
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      90204e0b
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 25f42b6a
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (51 commits)
        [MIPS] Make timer interrupt frequency configurable from kconfig.
        [MIPS] Correct HAL2 Kconfig description
        [MIPS] Fix R4K cache macro names
        [MIPS] Add Missing R4K Cache Macros to IP27 & IP32
        [MIPS] Support for the RM9000-based Basler eXcite smart camera platform.
        [MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board
        [MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors.
        [MIPS] SN: include asm/sn/types.h for nasid_t.
        [MIPS] Random fixes for sb1250
        [MIPS] Fix bcm1480 compile
        [MIPS] Remove support for NEC DDB5476.
        [MIPS] Remove support for NEC DDB5074.
        [MIPS] Cleanup memory managment initialization.
        [MIPS] SN: Declare bridge_pci_ops.
        [MIPS] Remove unused function alloc_pci_controller.
        [MIPS] IP27: Extract pci_ops into separate file.
        [MIPS] IP27: Use symbolic constants instead of magic numbers.
        [MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig.
        [MIPS] IP27: Cleanup N/M mode configuration.
        [MIPS] IP27: Throw away old unused hacks.
        ...
      25f42b6a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 4c84a39c
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (46 commits)
        IB/uverbs: Don't serialize with ib_uverbs_idr_mutex
        IB/mthca: Make all device methods truly reentrant
        IB/mthca: Fix memory leak on modify_qp error paths
        IB/uverbs: Factor out common idr code
        IB/uverbs: Don't decrement usecnt on error paths
        IB/uverbs: Release lock on error path
        IB/cm: Use address handle helpers
        IB/sa: Add ib_init_ah_from_path()
        IB: Add ib_init_ah_from_wc()
        IB/ucm: Get rid of duplicate P_Key parameter
        IB/srp: Factor out common request reset code
        IB/srp: Support SRP rev. 10 targets
        [SCSI] srp.h: Add I/O Class values
        IB/fmr: Use device's max_map_map_per_fmr attribute in FMR pool.
        IB/mthca: Fill in max_map_per_fmr device attribute
        IB/ipath: Add client reregister event generation
        IB/mthca: Add client reregister event generation
        IB: Move struct port_info from ipath to <rdma/ib_smi.h>
        IPoIB: Handle client reregister events
        IB: Add client reregister event type
        ...
      4c84a39c
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · d0b952a9
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (109 commits)
        [ETHTOOL]: Fix UFO typo
        [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer.
        [SCTP]: Send only 1 window update SACK per message.
        [SCTP]: Don't do CRC32C checksum over loopback.
        [SCTP] Reset rtt_in_progress for the chunk when processing its sack.
        [SCTP]: Reject sctp packets with broadcast addresses.
        [SCTP]: Limit association max_retrans setting in setsockopt.
        [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate.
        [IPV6]: Sum real space for RTAs.
        [IRDA]: Use put_unaligned() in irlmp_do_discovery().
        [BRIDGE]: Add support for NETIF_F_HW_CSUM devices
        [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM
        [TG3]: Convert to non-LLTX
        [TG3]: Remove unnecessary tx_lock
        [TCP]: Add tcp_slow_start_after_idle sysctl.
        [BNX2]: Update version and reldate
        [BNX2]: Use CPU native page size
        [BNX2]: Use compressed firmware
        [BNX2]: Add firmware decompression
        [BNX2]: Allow WoL settings on new 5708 chips
        ...
      
      Manual fixup for conflict in drivers/net/tulip/winbond-840.c
      d0b952a9
    • Linus Torvalds's avatar
      Merge branch 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6 · d90125bf
      Linus Torvalds authored
      * 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6: (25 commits)
        intelfb: fixup clock calculation debugging.
        Removed hard coded EDID buffer size.
        intelfb: use regular modedb table instead of VESA
        intelfb: use firmware EDID for mode database
        Revert "intelfb driver -- use the regular modedb table instead of the VESA"
        intelfb: int option fix
        sync modesetting code with X.org
        intelfb: align with changes from my X driver.
        intelfb driver -- use the regular modedb table instead of the VESA
        Adds support for 256MB aperture on 945 chipsets to the intelfb driver
        intelfb -- uses stride alignment of 64 on the 9xx chipsets.
        intelfb: some cleanups for intelfbhw
        intelfb: fixup pitch calculation like X does
        intelfb: fixup p calculation
        This patch makes a needlessly global struct static.
        intelfb: add i945GM support
        intelfb: fixup whitespace..
        intelfb: add hw cursor support for i9xx
        intelfb: make i915 modeset
        intelfb: add support for i945G
        ...
      d90125bf
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart · bfd189a8
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
        [AGPGART] alpha-agp warning fix
        [AGPGART] uninorth-agp warning fixes
        [AGPGART] Remove pointless initialisation in intel-agp
        [AGPGART] Remove pointless code from agp_generic_create_gatt_table()
      bfd189a8