Eric Lee / smarc-fsl-linux-kernel

04 Feb, 2008

17 commits

  • f5bb3a5e9   Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
    Jesper Juhl is the new trivial patches maintainer
    Documentation: mention email-clients.txt in SubmittingPatches
    fs/binfmt_elf.c: spello fix
    do_invalidatepage() comment typo fix
    Documentation/filesystems/porting fixes
    typo fixes in net/core/net_namespace.c
    typo fix in net/rfkill/rfkill.c
    typo fixes in net/sctp/sm_statefuns.c
    lib/: Spelling fixes
    kernel/: Spelling fixes
    include/scsi/: Spelling fixes
    include/linux/: Spelling fixes
    include/asm-m68knommu/: Spelling fixes
    include/asm-frv/: Spelling fixes
    fs/: Spelling fixes
    drivers/watchdog/: Spelling fixes
    drivers/video/: Spelling fixes
    drivers/ssb/: Spelling fixes
    drivers/serial/: Spelling fixes
    drivers/scsi/: Spelling fixes
    ...

    Linus Torvalds
     
  • 9853832c4   Merge branch 'locks' of git://linux-nfs.org/~bfields/linux ... Browse Code »

    * 'locks' of git://linux-nfs.org/~bfields/linux:
    pid-namespaces-vs-locks-interaction
    file locks: Use wait_event_interruptible_timeout()
    locks: clarify posix_locks_deadlock

    Linus Torvalds
     
  • b21761ff1   kbuild: Fix instrumentation removal breakage on avr32 ... Browse Code »

    AVR32 still includes Kconfig.instrumentation, so it won't build after
    this...

    Signed-off-by: Haavard Skinnemoen
    Acked-by: Mathieu Desnoyers
    Signed-off-by: Linus Torvalds

    Haavard Skinnemoen
     
  • 519cb6880   Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
    scsi: fix dependency bug in aic7 Makefile
    kbuild: add svn revision information to setlocalversion
    kbuild: do not warn about __*init/__*exit symbols being exported
    Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig
    Add HAVE_KPROBES
    Add HAVE_OPROFILE
    Create arch/Kconfig
    Fix ARM to play nicely with generic Instrumentation menu
    kconfig: ignore select of unknown symbol
    kconfig: mark config as changed when loading an alternate config
    kbuild: Spelling/grammar fixes for config DEBUG_SECTION_MISMATCH
    Remove __INIT_REFOK and __INITDATA_REFOK
    kbuild: print only total number of section mismatces found

    Linus Torvalds
     
  • 2f98735c9   vm audit: add VM_DONTEXPAND to mmap for drivers that need it ... Browse Code »

    Drivers that register a ->fault handler, but do not range-check the
    offset argument, must set VM_DONTEXPAND in the vm_flags in order to
    prevent an expanding mremap from overflowing the resource.

    I've audited the tree and attempted to fix these problems (usually by
    adding VM_DONTEXPAND where it is not obvious).

    Signed-off-by: Nick Piggin
    Signed-off-by: Linus Torvalds

    Nick Piggin
     
  • fe2528b96   ADB: Add missing #include <linux/platform_device.h> ... Browse Code »

    Commit c9f6d3d5c6d4f4cd3a53549a69c92951180e2a76 ("[POWERPC] adb: Replace
    sleep notifier with platform driver suspend/resume hooks") introduced
    compile errors on m68k because is not
    explicitly included. On powerpc, it's pulled in through .

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • a2e4e108c   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (77 commits)
    [IPV6]: Reorg struct ifmcaddr6 to save some bytes
    [INET_TIMEWAIT_SOCK]: Reorganize struct inet_timewait_sock to save some bytes
    [DCCP]: Reorganize struct dccp_sock to save 8 bytes
    [INET6]: Reorganize struct inet6_dev to save 8 bytes
    [SOCK] proto: Add hashinfo member to struct proto
    EMAC driver: Fix bug: The clock divisor is set to all ones at reset.
    EMAC driver: fix bug - invalidate data cache of new_skb->data range when cache is WB
    EMAC driver: add power down mode
    EMAC driver: ADSP-BF52x arch/mach support
    EMAC driver: use simpler comment headers and strip out information that is maintained in the scm's log
    EMAC driver: bf537 MAC multicast hash filtering patch
    EMAC driver: define MDC_CLK=2.5MHz and caculate mdc_div according to SCLK.
    EMAC driver: shorten the mdelay value to solve netperf performance issue
    [netdrvr] sis190: build fix
    sky2: fix Wake On Lan interaction with BIOS
    sky2: restore multicast addresses after recovery
    pci-skeleton: Misc fixes to build neatly
    phylib: Add Realtek 821x eth PHY support
    natsemi: Update locking documentation
    PHYLIB: Locking fixes for PHY I/O potentially sleeping
    ...

    Linus Torvalds
     
  • a6cc48eee   Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
    Driver core: Remove unneeded get_{device,driver}() calls.
    Driver core: Update some prototypes in platform.txt
    driver core: convert to use class_find_device api
    PM: Export device_pm_schedule_removal
    nozomi: finish constification
    nozomi: constify driver
    nozomi driver update
    Add ja_JP translation of stable_kernel_rules.txt
    kobject: kerneldoc comment fix
    kobject: Always build in kernel/ksysfs.o.

    Linus Torvalds
     
  • 7cf766914   Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
    PCI: fix 4x section mismatch warnings
    PCI: fix section mismatch warnings referring to pci_do_scan_bus
    pci: pci_enable_device_bars() fix for lpfc driver
    Revert "PCI: PCIE ASPM support"

    Linus Torvalds
     
  • ab1f16116   pid-namespaces-vs-locks-interaction ... Browse Code »

    fcntl(F_GETLK,..) can return pid of process for not current pid namespace
    (if process is belonged to the several namespaces). It is true also for
    pids in /proc/locks. So correct behavior is saving pointer to the struct
    pid of the process lock owner.

    Signed-off-by: Vitaliy Gusev
    Acked-by: Serge Hallyn
    Cc: "Eric W. Biederman"
    Signed-off-by: Andrew Morton
    Signed-off-by: J. Bruce Fields

    Vitaliy Gusev
     
  • 4321e01e7   file locks: Use wait_event_interruptible_timeout() ... Browse Code »

    interruptible_sleep_on_locked() is just an open-coded
    wait_event_interruptible_timeout(), with the one difference that
    interruptible_sleep_on_locked() doesn't bother to check the condition on
    which it is waiting, depending instead on the BKL to avoid the case
    where it blocks after the wakeup has already been called.

    locks_block_on_timeout() is only used in one place, so it's actually
    simpler to inline it into its caller.

    Signed-off-by: Matthew Wilcox
    Signed-off-by: J. Bruce Fields

    Matthew Wilcox
     
  • b533184fc   locks: clarify posix_locks_deadlock ... Browse Code »

    For such a short function (with such a long comment),
    posix_locks_deadlock() seems to cause a lot of confusion. Attempt to
    make it a bit clearer:

    - Remove the initial posix_same_owner() check, which can never
    pass (since this is only called in the case that block_fl and
    caller_fl conflict)
    - Use an explicit loop (and a helper function) instead of a goto.
    - Rewrite the comment, attempting a clearer explanation, and
    removing some uninteresting historical detail.

    Signed-off-by: J. Bruce Fields

    J. Bruce Fields
     
  • 8891fec65   scsi: fix dependency bug in aic7 Makefile ... Browse Code »

    Building the aic7xxx driver includes the copy
    of an .h file from a _shipped file.

    In a highly parallel build Ingo saw that the
    build sometimes failed (included distcc usage).
    It was tracked down to a missing dependency from the .c
    source file to the generated .h file.
    We started to build the .c file before the
    copy (cat) operation of the .h file completed
    and we then only got half of the definitions
    from the copied .h file.

    Add an explicit dependency from the .c files to the
    generated .h files so make knows all dependencies and
    finsih the build of the .h files before it starts
    building the .o files.

    Ingo tested this fix and reported:
    good news: hundreds of successful kernel builds and no failures
    overnight.

    Signed-off-by: Sam Ravnborg
    Acked-by: Ingo Molnar
    Acked-by: James Bottomley

    Sam Ravnborg
     
  • 1560a79a2   Jesper Juhl is the new trivial patches maintainer ... Browse Code »

    Jesper has agreed to take over maintainership for the trivial patches.

    Thanks, Jesper!

    Signed-off-by: Adrian Bunk

    Adrian Bunk
     
  • 097091c0a   Documentation: mention email-clients.txt in SubmittingPatches ... Browse Code »

    I was struggling to get my email-client no to mangle my patch files,
    and I didn't find enough information in the SubmittingPatches file.
    By looking for more information on the web, I eventually found the
    email-clients.txt file, and it answered all my needs

    This patch adds a reference to email-clients.txt in SubmittingPatches,
    and Mozilla related information which is no longer accurate
    (as opposed to the details found in email-clients.txt).

    This should be helpful for people sending their first patches,
    or not sending patches on a frequent basis.

    Signed-off-by: Michael Opdenacker
    Acked-by: Randy Dunlap
    Acked-by: Jeff Garzik
    Signed-off-by: Adrian Bunk

    Michael Opdenacker
     
  • 09c6dd3c9   fs/binfmt_elf.c: spello fix ... Browse Code »

    s/litle/little

    Signed-off-by: Ohad Ben-Cohen
    Signed-off-by: Adrian Bunk

    Ohad Ben-Cohen
     
  • 28bc44d7d   do_invalidatepage() comment typo fix ... Browse Code »

    Fix a typo in the comment for do_invalidatepage().

    Signed-off-by: Fengguang Wu
    Signed-off-by: Adrian Bunk

    Fengguang Wu
     

03 Feb, 2008

23 commits