1. 13 Mar, 2010 8 commits
    • Linus Torvalds's avatar
      Fix up .gitignore for top-level file patterns · 6db823cf
      Linus Torvalds authored
      Some of the gitignore file patters were explicitly meant to be only for
      the top level, but weren't marked that way, so they would trigger
      recursively in subdirectories too.  Normally that was harmless, but at
      least "linux" happened to trigger elsewhere too. Fix it up.
      
      And other patterns in that section weren't necessarily top-level at all.
      Reported-by: default avatarJiri Slaby <jirislaby@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6db823cf
    • Linus Torvalds's avatar
      Merge branch 'timers-fixes-for-linus' of... · 64d5aea3
      Linus Torvalds authored
      Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        timekeeping: Prevent oops when GENERIC_TIME=n
      64d5aea3
    • Eric Paris's avatar
      anon_inodes: mark the anon inode private · 3836a03d
      Eric Paris authored
      Inotify was switched to use anon_inode instead of its own private filesystem
      which only had one inode in commit c44dcc56 "switch inotify_user to
      anon_inode"
      
      The problem with this is that now the inotify inode is not a distinct inode
      which can be managed by LSMs.  userspace tools which use inotify were allowed
      to use the inotify inode but may not have had permission to do read/write type
      operations on the anon_inode.  After looking at the anon_inode and its users
      it looks like the best solution is to just mark the anon_inode as S_PRIVATE
      so the security system will ignore it.
      Signed-off-by: default avatarEric Paris <eparis@redhat.com>
      Acked-by: default avatarJames Morris <jmorris@namei.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3836a03d
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 · 83c0fb65
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
        udf: use ext2_find_next_bit
        udf: Do not read inode before writing it
        udf: Fix unalloc space handling in udf_update_inode
      83c0fb65
    • Linus Torvalds's avatar
      Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm · 11bfe2ea
      Linus Torvalds authored
      * 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
        msm_sdcc.c: missing brackets in msmsdcc_resume()
      11bfe2ea
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · b6fedfd2
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/booke: Fix breakpoint/watchpoint one-shot behavior
        powerpc: Reduce printk from pseries_mach_cpu_die()
        powerpc: Move checks in pseries_mach_cpu_die()
        powerpc: Reset kernel stack on cpu online from cede state
        powerpc: Fix G5 thermal shutdown
        powerpc/pseries: Pass CPPR value to H_XIRR hcall
        powerpc/booke: Fix a couple typos in the advanced ptrace code
        powerpc: Fix SMP build with disabled CPU hotplugging.
        powerpc: Dynamically allocate pacas
        powerpc/perf: e500 support
        powerpc/perf: Build callchain code regardless of hardware event support.
        powerpc/cpm2: Checkpatch cleanup
        powerpc/86xx: Renaming following split of GE Fanuc joint venture
        powerpc/86xx: Convert gef_pic_lock to raw_spinlock
        powerpc/qe: Convert qe_ic_lock to raw_spinlock
        powerpc/82xx: Convert pci_pic_lock to raw_spinlock
        powerpc/85xx: Convert socrates_fpga_pic_lock to raw_spinlock
      b6fedfd2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · c32da023
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits)
        doc: fix typo in comment explaining rb_tree usage
        Remove fs/ntfs/ChangeLog
        doc: fix console doc typo
        doc: cpuset: Update the cpuset flag file
        Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed
        Remove drivers/parport/ChangeLog
        Remove drivers/char/ChangeLog
        doc: typo - Table 1-2 should refer to "status", not "statm"
        tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments
        No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h
        devres/irq: Fix devm_irq_match comment
        Remove reference to kthread_create_on_cpu
        tree-wide: Assorted spelling fixes
        tree-wide: fix 'lenght' typo in comments and code
        drm/kms: fix spelling in error message
        doc: capitalization and other minor fixes in pnp doc
        devres: typo fix s/dev/devm/
        Remove redundant trailing semicolons from macros
        fix typo "definetly" -> "definitely" in comment
        tree-wide: s/widht/width/g typo in comments
        ...
      
      Fix trivial conflict in Documentation/laptops/00-INDEX
      c32da023
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · dca1d9f6
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (370 commits)
        ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock
        ARM: S3C2443: Remove #if 0 for clk_mpll
        ARM: S3C2443: Update notes on MPLLREF clock
        ARM: S3C2443: Further clksrc-clk conversions
        ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation
        USB: Fix s3c-hsotg build following Samsung platform header moves
        ARM: S3C64XX: Reintroduce unconditional build of audio device
        ARM: 5961/1: ux500: fix CLKRST addresses
        ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted
        ASoC: Fix S3C64xx IIS driver for Samsung header reorg
        ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support
        [ARM] pxa: fix typo in mxm8x10.h
        [ARM] pxa/raumfeld: set GPIO drive bits for LED pins
        [ARM] pxa/zeus: Add support for mcp2515 CAN bus
        [ARM] pxa/zeus: Add support for onboard max6369 watchdog
        [ARM] pxa/zeus: Add Eurotech as the manufacturer
        [ARM] pxa/zeus: Correct the USB host initialisation flags
        [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress
        [ARM] pxa: refactor uncompress.h for non-PXA uarts
        [ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs
        ...
      dca1d9f6
  2. 12 Mar, 2010 32 commits