Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Feb 10, 2008
  1. Linux 2.6.25-rc1

    Linus Torvalds authored
    .. and I really need to call it something else.  Maybe it is time to
    bring back the weasel series, since weasels always make me feel good
    about a kernel.
  2. Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

    Linus Torvalds authored
    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
      [ARM] constify function pointer tables
      [ARM] 4823/1: AT91 section fix
      [ARM] 4824/1: pxa: clear RDH bit after any reset
      [ARM] pxa: remove debugging PM: printk
      ARM: OMAP1: Misc clean-up
      ARM: OMAP1: Update defconfigs for omap1
      ARM: OMAP1: Palm Tungsten E board clean-up
      ARM: OMAP1: Use I2C bus registration helper for omap1
      ARM: OMAP1: Remove omap_sram_idle()
      ARM: OMAP1: PM fixes for OMAP1
      ARM: OMAP1: Use MMC multislot structures for Siemens SX1 board
      ARM: OMAP1: Make omap1 use MMC multislot structures
      ARM: OMAP1: Change the comments to C style
      ARM: OMAP1: Make omap1 boards to use omap_nand_platform_data
      ARM: OMAP: Add helper module for board specific I2C bus registration
      ARM: OMAP: Add dmtimer support for OMAP3
      ARM: OMAP: Pre-3430 clean-up for dmtimer.c
      ARM: OMAP: Add DMA support for chaining and 3430
      ARM: OMAP: Add 24xx GPIO debounce support
      ARM: OMAP: Get rid of unnecessary ifdefs in GPIO code
      ...
  3. Change pci_raw_ops to pci_raw_read/write

    Matthew Wilcox authored Linus Torvalds committed
    We want to allow different implementations of pci_raw_ops for standard
    and extended config space on x86.  Rather than clutter generic code with
    knowledge of this, we make pci_raw_ops private to x86 and use it to
    implement the new raw interface -- raw_pci_read() and raw_pci_write().
    
    Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. PCI x86: always use conf1 to access config space below 256 bytes

    Ivan Kokshaysky authored Linus Torvalds committed
    Thanks to Loic Prylli <loic@myri.com>, who originally proposed
    this idea.
    
    Always using legacy configuration mechanism for the legacy config space
    and extended mechanism (mmconf) for the extended config space is
    a simple and very logical approach. It's supposed to resolve all
    known mmconf problems. It still allows per-device quirks (tweaking
    dev->cfg_size). It also allows to get rid of mmconf fallback code.
    
    Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      [PKT_SCHED] ematch: Fix build warning.
  6. Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
      hrtimer: don't modify restart_block->fn in restart functions
      hrtimer: fix *rmtp/restarts handling in compat_sys_nanosleep()
      hrtimer: fix *rmtp handling in hrtimer_nanosleep()
      ntp: correct inconsistent interval/tick_length usage
  7. splice: fix user pointer access in get_iovec_page_array()

    Bastian Blank authored Linus Torvalds committed
    Commit 8811930 ("splice: missing user
    pointer access verification") added the proper access_ok() calls to
    copy_from_user_mmap_sem() which ensures we can copy the struct iovecs
    from userspace to the kernel.
    
    But we also must check whether we can access the actual memory region
    pointed to by the struct iovec to fix the access checks properly.
    
    Signed-off-by: Bastian Blank <waldi@debian.org>
    Acked-by: Oliver Pinter <oliver.pntr@gmail.com>
    Cc: Jens Axboe <jens.axboe@oracle.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @davem330

    [PKT_SCHED] ematch: Fix build warning.

    davem330 authored
    Commit 954415e ("[PKT_SCHED] ematch:
    tcf_em_destroy robustness") removed a cast on em->data when
    passing it to kfree(), but em->data is an integer type that can
    hold pointers as well as other values so the cast is necessary.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  9. hrtimer: don't modify restart_block->fn in restart functions

    Oleg Nesterov authored Thomas Gleixner committed
    hrtimer_nanosleep_restart() clears/restores restart_block->fn. This is
    pointless and complicates its usage. Note that if sys_restart_syscall()
    doesn't actually happen, we have a bogus "pending" restart->fn anyway,
    this is harmless.
    
    Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
    Cc: Alexey Dobriyan <adobriyan@sw.ru>
    Cc: Pavel Emelyanov <xemul@sw.ru>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Toyo Abe <toyoa@mvista.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  10. hrtimer: fix *rmtp/restarts handling in compat_sys_nanosleep()

    Oleg Nesterov authored Thomas Gleixner committed
    Spotted by Pavel Emelyanov and Alexey Dobriyan.
    
    compat_sys_nanosleep() implicitly uses hrtimer_nanosleep_restart(), this can't
    work. Make a suitable compat_nanosleep_restart() helper.
    
    Introduced by commit c70878b
    hrtimer: hook compat_sys_nanosleep up to high res timer code
    
    Also, set ->addr_limit = KERNEL_DS before doing hrtimer_nanosleep(), this func
    was changed by the previous patch and now takes the "__user *" parameter.
    
    Thanks to Ingo Molnar for fixing the bug in this patch.
    
    Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Alexey Dobriyan <adobriyan@sw.ru>
    Cc: Pavel Emelyanov <xemul@sw.ru>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Toyo Abe <toyoa@mvista.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  11. hrtimer: fix *rmtp handling in hrtimer_nanosleep()

    Oleg Nesterov authored Thomas Gleixner committed
    Spotted by Pavel Emelyanov and Alexey Dobriyan.
    
    hrtimer_nanosleep() sets restart_block->arg1 = rmtp, but this rmtp points to
    the local variable which lives in the caller's stack frame. This means that
    if sys_restart_syscall() actually happens and it is interrupted as well, we
    don't update the user-space variable, but write into the already dead stack
    frame.
    
    Introduced by commit 04c2271
    hrtimer: Rework hrtimer_nanosleep to make sys_compat_nanosleep easier
    
    Change the callers to pass "__user *rmtp" to hrtimer_nanosleep(), and change
    hrtimer_nanosleep() to use copy_to_user() to actually update *rmtp.
    
    Small problem remains. man 2 nanosleep states that *rtmp should be written if
    nanosleep() was interrupted (it says nothing whether it is OK to update *rmtp
    if nanosleep returns 0), but (with or without this patch) we can dirty *rem
    even if nanosleep() returns 0.
    
    NOTE: this patch doesn't change compat_sys_nanosleep(), because it has other
    bugs. Fixed by the next patch.
    
    Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
    Cc: Alexey Dobriyan <adobriyan@sw.ru>
    Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
    Cc: Pavel Emelyanov <xemul@sw.ru>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Toyo Abe <toyoa@mvista.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    
     include/linux/hrtimer.h |    2 -
     kernel/hrtimer.c        |   51 +++++++++++++++++++++++++-----------------------
     kernel/posix-timers.c   |   14 +------------
     3 files changed, 30 insertions(+), 37 deletions(-)
  12. ntp: correct inconsistent interval/tick_length usage

    john stultz authored Thomas Gleixner committed
    clocksource initialization and error accumulation.  This corrects a 280ppm
    drift seen on some systems using acpi_pm, and affects other clocksources as
    well (likely to a lesser degree).
    
    Signed-off-by: John Stultz <johnstul@us.ibm.com>
    Cc: Roman Zippel <zippel@linux-m68k.org>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  13. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (28 commits)
      [NET_SCHED] sch_htb: htb_requeue fix
      [IPV6]: Replace using the magic constant "1024" with IP6_RT_PRIO_USER for fc_metric.
      starfire: secton fix
      via-velocity: section fix
      natsemi: section fix
      typhoon: section fix
      isdn: fix section mismatch warning for ISACVer
      isdn: fix section mismatch warnings from hisax_cs_setup_card
      isdn: fix section mismatch warnings in isac.c and isar.c
      isdn: fix section mismatch warning in hfc_sx.c
      [PKT_SCHED] ematch: tcf_em_destroy robustness
      [PKT_SCHED]: deinline functions in meta match
      [SCTP]: Convert sctp_dbg_objcnt to seq files.
      [SCTP]: Use snmp_fold_field instead of a homebrew analogue.
      [IGMP]: Optimize kfree_skb in igmp_rcv.
      [KEY]: Convert net/pfkey to use seq files.
      [KEY]: Clean up proc files creation a bit.
      pppol2tp: fix printk warnings
      bnx2: section fix
      bnx2x: section fix
      ...
  14. @davem330

    [NET_SCHED] sch_htb: htb_requeue fix

    Jarek Poplawski authored davem330 committed
    htb_requeue() enqueues skbs for which htb_classify() returns NULL.
    This is wrong because such skbs could be handled by NET_CLS_ACT code,
    and the decision could be different than earlier in htb_enqueue().
    So htb_requeue() is changed to work and look more like htb_enqueue().
    
    Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  15. @ramirosen @davem330

    [IPV6]: Replace using the magic constant "1024" with IP6_RT_PRIO_USER…

    ramirosen authored davem330 committed
    … for fc_metric.
    
    This patch replaces the explicit usage of the magic constant "1024"
    with IP6_RT_PRIO_USER in the IPV6 tree.
    
    Signed-off-by: Rami Rosen <ramirose@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  16. @davem330

    starfire: secton fix

    Andrew Morton authored davem330 committed
    gcc-3.4.4 on powerpc:
    
    drivers/net/starfire.c:219: error: version causes a section type conflict
    
    Cc: Jeff Garzik <jeff@garzik.org>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  17. @davem330

    via-velocity: section fix

    Andrew Morton authored davem330 committed
    From: Andrew Morton <akpm@linux-foundation.org>
    
    gcc-3.4.4 on powerpc:
    
    drivers/net/via-velocity.c:443: error: chip_info_table causes a section type conflict
    
    on this one I had to remove the __devinitdata too.  Don't know why.
    
    Cc: Jeff Garzik <jeff@garzik.org>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  18. @davem330

    natsemi: section fix

    Andrew Morton authored davem330 committed
    gcc-3.4.4 on powerpc:
    
    drivers/net/natsemi.c:245: error: natsemi_pci_info causes a section type conflict
    
    Cc: Jeff Garzik <jeff@garzik.org>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  19. @davem330

    typhoon: section fix

    Andrew Morton authored davem330 committed
    gcc-3.4.4 on powerpc:
    
    drivers/net/typhoon.c:137: error: version causes a section type conflict
    
    Cc: Jeff Garzik <jeff@garzik.org>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  20. Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (32 commits)
      x86: cpa, strict range check in try_preserve_large_page()
      x86: cpa, enable CONFIG_DEBUG_PAGEALLOC on 64-bit
      x86: cpa, use page pool
      x86: introduce page pool in cpa
      x86: DEBUG_PAGEALLOC: enable after mem_init()
      brk: help text typo fix
      lguest: accept guest _PAGE_PWT page table entries
      x86 PM: update stale comments
      x86 PM: consolidate suspend and hibernation code
      x86 PM: rename 32-bit files in arch/x86/power
      x86 PM: move 64-bit hibernation files to arch/x86/power
      x86: trivial printk optimizations
      x86: fix early_ioremap pagetable ops
      x86: construct 32-bit boot time page tables in native format.
      x86, core: remove CONFIG_FORCED_INLINING
      x86: avoid unused variable warning in mm/init_64.c
      x86: fixup more paravirt fallout
      brk: document randomize_va_space and CONFIG_COMPAT_BRK (was Re:
      x86: fix sparse warnings in acpi/bus.c
      x86: fix sparse warning in topology.c
      ...
  21. @davem330

    isdn: fix section mismatch warning for ISACVer

    Sam Ravnborg authored davem330 committed
    Fix following warnings:
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x19723): Section mismatch in reference from the function ISACVersion() to the variable .devinit.data:ISACVer
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x2005b): Section mismatch in reference from the function setup_avm_a1_pcmcia() to the function .devinit.text:setup_isac()
    
    ISACVer were only used from function annotated __devinit
    so add same annotation to ISACVer.
    One af the fererencing functions missed __devinit so add it
    and kill an additional warning.
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Acked-by: Karsten Keil <kkeil@suse.de>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  22. @davem330

    isdn: fix section mismatch warnings from hisax_cs_setup_card

    Sam Ravnborg authored davem330 committed
    Fix the following warnings:
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x722): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_teles3()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x72c): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_s0box()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x736): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_telespci()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x747): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_avm_pcipnp()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x74e): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_elsa()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x755): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_diva()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x75c): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_sedlbauer()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x763): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_netjet_s()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x76a): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_hfcpci()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x771): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_hfcsx()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x778): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_niccy()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x77f): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_bkm_a4t()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x786): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_sct_quadro()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x78d): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_gazel()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x794): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_w6692()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x79b): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_netjet_u()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x7a2): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_enternow_pci()
    
    checkcard() are the only user of hisax_cs_setup_card().
    And checkcard is only used during init or when hot plugging
    ISDN devices. So annotate hisax_cs_setup_card() with __devinit.
    checkcard() is used by exported functions so it cannot be
    annotated __devinit. Annotate it with __ref so modpost
    ignore references to _devinit section.
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Acked-by: Karsten Keil <kkeil@suse.de>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  23. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: (24 commits)
      [SPARC]: Add solaris/sunos binary support to feature removal schedule.
      [SPARC]: Merge asm-sparc{,64}/a.out.h
      [SPARC]: Merge asm-sparc{,64}/fb.h
      [SPARC]: Merge asm-sparc{,64}/errno.h
      [SPARC]: Merge asm-sparc{,64}/emergency-restart.h
      [SPARC]: Merge asm-sparc{,64}/div64.h
      [SPARC]: Merge asm-sparc{,64}/device.h
      [SPARC]: Merge asm-sparc{,64}/current.h
      [SPARC]: Merge asm-sparc{,64}/cputime.h
      [SPARC]: Merge asm-sparc{,64}/cache.h
      [SPARC]: Merge asm-sparc{,64}/byteorder.h
      [SPARC]: Merge asm-sparc{,64}/bugs.h
      [SPARC]: Merge asm-sparc{,64}/bug.h
      [SPARC]: Kill BSD errno translation table and header files.
      [SPARC]: Merge asm-sparc{,64}/bpp.h
      [SPARC]: Merge include/asm-sparc{,64}/auxvec.h
      [SPARC]: Merge include/asm-sparc{,64}/of_device.h
      [SPARC]: Merge include/asm-sparc{,64}/prom.h
      [SPARC]: Remove of_platform_device_create
      [SPARC64]: Add kretprobe support.
      ...
  24. @davem330

    isdn: fix section mismatch warnings in isac.c and isar.c

    Sam Ravnborg authored davem330 committed
    Fix the following warnings:
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x1b276): Section mismatch in reference from the function inithscxisac() to the function .devinit.text:clear_pending_isac_ints()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x1b286): Section mismatch in reference from the function inithscxisac() to the function .devinit.text:initisac()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x1fec7): Section mismatch in reference from the function AVM_card_msg() to the function .devinit.text:clear_pending_isac_ints()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x21669): Section mismatch in reference from the function AVM_card_msg() to the function .devinit.text:clear_pending_isac_ints()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x21671): Section mismatch in reference from the function AVM_card_msg() to the function .devinit.text:initisac()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x2991e): Section mismatch in reference from the function Sedl_card_msg() to the function .devinit.text:clear_pending_isac_ints()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x29936): Section mismatch in reference from the function Sedl_card_msg() to the function .devinit.text:initisac()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x2993e): Section mismatch in reference from the function Sedl_card_msg() to the function .devinit.text:initisar()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x2e026): Section mismatch in reference from the function NETjet_S_card_msg() to the function .devinit.text:clear_pending_isac_ints()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x2e02e): Section mismatch in reference from the function NETjet_S_card_msg() to the function .devinit.text:initisac()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x37813): Section mismatch in reference from the function BKM_card_msg() to the function .devinit.text:clear_pending_isac_ints()
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x37823): Section mismatch in reference from the function BKM_card_msg() to the function .devinit.text:initisac()
    
    initisar(), initisac() and clear_pending_isac_ints()
    were all used via a cardmsg fnction - which may be called
    ouside __devinit context.
    So remove the bogus __devinit annotation of the
    above three functions to fix the warnings.
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Acked-by: Karsten Keil <kkeil@suse.de>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  25. Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    Linus Torvalds authored
    …/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: Add new "development flag" to the ext4 filesystem
      ext4: Don't panic in case of corrupt bitmap
      ext4: allocate struct ext4_allocation_context from a kmem cache
      JBD2:  Clear buffer_ordered flag for barried IO request on success
      ext4: Fix Direct I/O locking
      ext4: Fix circular locking dependency with migrate and rm.
      allow in-inode EAs on ext4 root inode
      ext4: Fix null bh pointer dereference in mballoc
      ext4: Don't set EXTENTS_FL flag for fast symlinks
      JBD2: Use the incompat macro for testing the incompat feature.
      jbd2: Fix reference counting on the journal commit block's buffer head
      [PATCH] jbd: Remove useless loop when writing commit record
      jbd2: Add error check to journal_wait_on_commit_record to avoid oops
  26. @davem330

    isdn: fix section mismatch warning in hfc_sx.c

    Sam Ravnborg authored davem330 committed
    Fix the following warning:
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x35818): Section mismatch in reference from the function hfcsx_card_msg() to the function .devinit.text:inithfcsx()
    
    hfcsx_card_msg() may be called outside __devinit context.
    Following the program logic is looks like the CARD_INIT branch
    will only be taken under __devinit context but to be consistent
    remove the __devinit annotation of inithfcsx() so we
    do not mix non-__devinit and __devinit code.
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Acked-by: Karsten Keil <kkeil@suse.de>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  27. @caglar10ur

    drivers/media/video/em28xx/: Fix undefined symbol error with CONFIG_S…

    caglar10ur authored Linus Torvalds committed
    …ND=N
    
    Without this you get undefined symbol errors with CONFIG_SND=N:
    
      ERROR: "snd_pcm_period_elapsed" [drivers/media/video/em28xx/em28xx-alsa.ko] undefined!
      ERROR: "snd_pcm_hw_constraint_integer" [drivers/media/video/em28xx/em28xx-alsa.ko] undefined!
      ERROR: "snd_pcm_set_ops" [drivers/media/video/em28xx/em28xx-alsa.ko] undefined!
      ERROR: "snd_pcm_lib_ioctl" [drivers/media/video/em28xx/em28xx-alsa.ko] undefined!
      ERROR: "snd_card_new" [drivers/media/video/em28xx/em28xx-alsa.ko] undefined!
      ERROR: "snd_card_free" [drivers/media/video/em28xx/em28xx-alsa.ko] undefined!
      ERROR: "snd_card_register" [drivers/media/video/em28xx/em28xx-alsa.ko] undefined!
      ERROR: "snd_pcm_new" [drivers/media/video/em28xx/em28xx-alsa.ko] undefined!
    
    Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  28. @caglar10ur

    Update kernel/.gitignore with new auto-generated files

    caglar10ur authored Linus Torvalds committed
    Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  29. @caglar10ur

    Update arch/x86/boot/.gitignore with new auto-generated files

    caglar10ur authored Linus Torvalds committed
    Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  30. @caglar10ur

    rtc-r9701.c: silence compiler warning

    caglar10ur authored Linus Torvalds committed
    Commit 75b6102 ("rtc: add support for
    Epson RTC-9701JE V4") introduced the warning
    
      drivers/rtc/rtc-r9701.c: In function `r9701_get_datetime':
      drivers/rtc/rtc-r9701.c:74: warning: unused variable `time'
    
    Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  31. @caglar10ur

    x25_asy.c: silence compiler warning

    caglar10ur authored Linus Torvalds committed
    Commit 11b0cc3 ("x25_asy: Fix ref count
    rule violation") introduced the warning
    
      drivers/net/wan/x25_asy.c: In function `x25_asy_open_tty':
      drivers/net/wan/x25_asy.c:557: warning: unused variable `ld'
    
    Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  32. @davem330

    [PKT_SCHED] ematch: tcf_em_destroy robustness

    Stephen Hemminger authored davem330 committed
    Make the code in tcf_em_tree_destroy more robust and cleaner:
     * Don't need to cast pointer to kfree() or avoid passing NULL.
     * After freeing the tree, clear the pointer to avoid possible problems
    from repeated free.
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  33. @davem330

    [PKT_SCHED]: deinline functions in meta match

    Stephen Hemminger authored davem330 committed
    A couple of functions in meta match don't need to be inline.
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  34. @xemul @davem330

    [SCTP]: Convert sctp_dbg_objcnt to seq files.

    xemul authored davem330 committed
    This makes the code use a good proc API and the text ~50 bytes shorter.
    
    Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
    Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  35. @xemul @davem330

    [SCTP]: Use snmp_fold_field instead of a homebrew analogue.

    xemul authored davem330 committed
    SCPT already depends in INET, so this doesn't create additional
    dependencies.
    
    Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
    Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Something went wrong with that request. Please try again.