Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 28, 2008
  1. @torvalds

    Linux 2.6.27-rc5

    torvalds authored
  2. @torvalds

    Merge master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds authored
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] 5226/1: remove unmatched comment end.
      [ARM] Skip memory holes in FLATMEM when reading /proc/pagetypeinfo
      [ARM] use bcd2bin/bin2bcd
      [ARM] use the new byteorder headers
      [ARM] OMAP: Fix 2430 SMC91x ethernet IRQ
      [ARM] OMAP: Add and update OMAP default configuration files
      [ARM] OMAP: Change mailing list for OMAP in MAINTAINERS
      [ARM] S3C2443: Fix the S3C2443 clock register definitions
      [ARM] JIVE: Fix the spi bus numbering
      [ARM] S3C24XX: pwm.c: stop debugging output
      [ARM] S3C24XX: Fix sparse warnings in pwm.c
      [ARM] S3C24XX: Fix spare errors in pwm-clock driver
      [ARM] S3C24XX: Fix sparse warnings in arch/arm/plat-s3c24xx/gpiolib.c
      [ARM] S3C24XX: Fix nor-simtec driver sparse errors
      [ARM] 5225/1: zaurus: Register I2C controller for audio codecs
      [ARM] orion5x: update defconfig to v2.6.27-rc4
      [ARM] Orion: register UART1 on QNAP TS-209 and TS-409
      [ARM] Orion: activate lm75 driver on DNS-323
      [ARM] Orion: fix MAC detection on QNAP TS-209 and TS-409
      [ARM] Orion: Fix boot crash on Kurobox Pro
  3. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/cooloney/blackfin-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
      Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE
      Blackfin arch: sram: use 'unsigned long' for irqflags
      Blackfin arch: let PCI depend on BROKEN
      Blackfin arch: move include/asm-blackfin header files to arch/blackfin
      Blackfin arch: fix bug - MPU crashes under stress
      Blackfin arch: Fix bug - when to rmmod the L1_module, it stucks and then reboot the board.
      Blackfin arch: dont actually need to muck with EMAC_SYSTAT for BF52x for demuxing
      Blackfin arch: Add MTD Partitions for MTD_DATAFLASH, increase max SPI SCLK
  4. @torvalds

    Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds authored
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      exit signals: use of uninitialized field notify_count
      lockdep: fix invalid list_del_rcu in zap_class
      lockstat: repair erronous contention statistics
      lockstat: fix numerical output rounding error
  5. @torvalds

    Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    torvalds authored
    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: rt-bandwidth accounting fix
      sched: fix sched_rt_rq_enqueue() resched idle
  6. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: update defconfigs
      x86: msr: fix bogus return values from rdmsr_safe/wrmsr_safe
      x86: cpuid: correct return value on partial operations
      x86: msr: correct return value on partial operations
      x86: cpuid: propagate error from smp_call_function_single()
      x86: msr: propagate errors from smp_call_function_single()
      smp: have smp_call_function_single() detect invalid CPUs
  7. @torvalds

    Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare…

    torvalds authored
    …-2.6
    
    * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
      i2c: Prevent log spam on some DVB adapters
      i2c: Add missing kerneldoc descriptions
      i2c: Fix device_init_wakeup place
  8. @rjwysocki @torvalds

    ftrace: disable tracing for hibernation

    rjwysocki authored torvalds committed
    In accordance with commit f42ac38
    ("ftrace: disable tracing for suspend to ram"), disable tracing
    around the suspend code in hibernation code paths.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @jcdubois

    [ARM] 5226/1: remove unmatched comment end.

    jcdubois authored Russell King committed
    remove unmatched comment end.
    
    Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  10. sched: rt-bandwidth accounting fix

    Peter Zijlstra authored Ingo Molnar committed
    It fixes an accounting bug where we would continue accumulating runtime
    even though the bandwidth control is disabled. This would lead to very long
    throttle periods once bandwidth control gets turned on again.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  11. @mhennerich

    Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE

    mhennerich authored Bryan Wu committed
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
  12. @vegard

    Blackfin arch: sram: use 'unsigned long' for irqflags

    vegard authored Bryan Wu committed
    Using just 'unsigned' will make flags an unsigned int. While this is
    arguably not an error on blackfin where sizeof(int) == sizeof(long),
    the patch is still justified on the grounds of principle.
    
    The patch was generated using the Coccinelle semantic patch framework.
    
    Cc: Julia Lawall <julia@diku.dk>
    Cc: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
  13. sched: fix sched_rt_rq_enqueue() resched idle

    John Blackwood authored Ingo Molnar committed
    When sysctl_sched_rt_runtime is set to something other than -1 and the
    CONFIG_RT_GROUP_SCHED kernel parameter is NOT enabled, we get into a state
    where we see one or more CPUs idling forvever even though there are
    real-time
    tasks in their rt runqueue that are able to run (no longer throttled).
    
    The sequence is:
    
    - A real-time task is running when the timer sets the rt runqueue
        to throttled, and the rt task is resched_task()ed and switched
        out, and idle is switched in since there are no non-rt tasks to
        run on that cpu.
    
    - Eventually the do_sched_rt_period_timer() runs and un-throttles
        the rt runqueue, but we just exit the timer interrupt and go back
        to executing the idle task in the idle loop forever.
    
    If we change the sched_rt_rq_enqueue() routine to use some of the code
    from the CONFIG_RT_GROUP_SCHED enabled version of this same routine and
    resched_task() the currently executing task (idle in our case) if it is
    a lower priority task than the higher rt task in the now un-throttled
    runqueue, the problem is no longer observed.
    
    Signed-off-by: John Blackwood <john.blackwood@ccur.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  14. i2c: Prevent log spam on some DVB adapters

    Jean Delvare authored Jean Delvare committed
    Some DVB adapters do not support the special I2C transaction that we
    use for probing purposes. There's no point in logging this event, as
    there's nothing the user can do and in general there is no actual
    problem. So, degrade one of these messages to a debug message, and
    move the other one around so that it is only printed on bogus drivers.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Uwe Bugla <uwe.bugla@gmx.de>
  15. i2c: Add missing kerneldoc descriptions

    Jean Delvare authored Jean Delvare committed
    Add missing kernel descriptions of struct i2c_driver members.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Randy Dunlap <rdunlap@xenotime.net>
    Cc: David Brownell <david-b@pacbell.net>
  16. @RandomReaper

    i2c: Fix device_init_wakeup place

    RandomReaper authored Jean Delvare committed
    device_init_wakeup must be called after device_register.
    
    Signed-off-by: Marc Pignat <marc.pignat@hevs.ch>
    Acked-by: David Brownell <david-b@pacbell.net>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  17. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (55 commits)
      sctp: fix random memory dereference with SCTP_HMAC_IDENT option.
      sctp: correct bounds check in sctp_setsockopt_auth_key
      wan: Missing capability checks in sbni_ioctl()
      e100, fix iomap read
      qeth: preallocated header account offset
      qeth: l2 write unicast list to hardware
      qeth: use -EOPNOTSUPP instead of -ENOTSUPP.
      ibm_newemac: Don't call dev_mc_add() before device is registered
      net: don't grab a mutex within a timer context in gianfar
      forcedeth: fix checksum flag
      net/usb/mcs7830: add set_mac_address
      net/usb/mcs7830: new device IDs
      [netdrvr] smc91x: fix resource removal (null ptr deref)
      ibmveth: fix bad UDP checksums
      [netdrvr] hso: dev_kfree_skb crash fix
      [netdrvr] hso: icon 322 detection fix
      atl1: disable TSO by default
      atl1e: multistatement if missing braces
      igb: remove 82576 quad adapter
      drivers/net/skfp/ess.c: fix compile warnings
      ...
Commits on Aug 27, 2008
  1. @davem330

    sctp: fix random memory dereference with SCTP_HMAC_IDENT option.

    Vlad Yasevich authored davem330 committed
    The number of identifiers needs to be checked against the option
    length.  Also, the identifier index provided needs to be verified
    to make sure that it doesn't exceed the bounds of the array.
    
    Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. @davem330

    sctp: correct bounds check in sctp_setsockopt_auth_key

    Vlad Yasevich authored davem330 committed
    The bonds check to prevent buffer overlflow was not exactly
    right.  It still allowed overflow of up to 8 bytes which is
    sizeof(struct sctp_authkey).
    
    Since optlen is already checked against the size of that struct,
    we are guaranteed not to cause interger overflow either.
    
    Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. Merge branch 'omap-rmk'

    Russell King authored Russell King committed
  4. @torvalds

    IB/mlx4: Actually return L_Key and R_Key for fast register MRs

    Vladimir Sokolovsky authored torvalds committed
    Initialize the L_Key and R_Key for memory regions returned from
    mlx4_ib_alloc_fast_reg_mr().  Otherwise callers just get garbage for
    the memory keys and can't do anything useful with these MRs.
    
    Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.co.il>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    torvalds authored
    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      [WATCHDOG] removed unused #include <version.h>
      [WATCHDOG] at91rm9200_wdt.c: fix misleading indentation
      [WATCHDOG] mpc8xxx_wdt: fix modular build
      [WATCHDOG] hpwdt.c kdebug support
      [WATCHDOG] Add support for the IDT RC32434 watchdog
      [WATCHDOG] Add support for the built-int RDC R-321x SoC watchdog
      [WATHDOG] delete unused driver mpc8xx_wdt.c
      [WATCHDOG] Fix s3c2410_wdt driver coding style issues
      [WATCHDOG] Clean out header of s3c2410_wdt driver.
      [WATCHDOG] Fix NULL usage in s3c2410_wdt driver.
  6. @Alan-Cox @torvalds

    tty: Fix termios tty window resize race with pty/tty pair

    Alan-Cox authored torvalds committed
    Kanru Chen posted a patch versus the old code which deals with the case
    where you resize the pty side of a pty/tty pair. In that situation the
    termios data is updated for both pty and tty but the locks are not held
    for the right side.
    
    This implements the fix differently against the updated tty code. Patch
    by self but the hard bit (noticing and fixing the bug) is thanks to Kanru
    Chen.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @Alan-Cox @torvalds

    tty: TIOCGSOFTCAR/SSOFTCAR on pty is wron

    Alan-Cox authored torvalds committed
    The termios settings ioctls on a pty should affect the bound tty side not
    the pty. The SOFTCAR ioctls use the wrong device file.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      [CIFS] Add destroy routine for dns_resolver
      [CIFS] Reorder cifs config item for better clarity
      [CIFS] Correct keys dependency for cifs kerberos support
  9. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/penberg/slab-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
      slub: Disable NUMA remote node defragmentation by default
  10. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      [PATCH] deal with the first call of ->show() generating no output
      [PATCH] fix ->llseek() for a bunch of directories
      [PATCH] fix regular readdir() and friends
      [PATCH] fix hpux_getdents()
      [PATCH] fix osf_getdirents()
      [PATCH] ntfs: use d_add_ci
      [PATCH] change d_add_ci argument ordering
      [PATCH] fix efs_lookup()
      [PATCH] proc: inode number fixlet
  11. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc: Add target for a stripped kernel
      sparc64: Make NUMA depend upon SMP.
  12. @torvalds

    Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds authored
    …el/git/airlied/drm-2.6
    
    * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm: don't set the signal blocker on the master process.
      drm: don't call the vblank tasklet with irqs disabled.
      r300: Fix cliprect emit
      drm/radeon: r300_cmdbuf: Always emit INDX_BUFFER immediately after DRAW_INDEX
      radeon: fix some hard lockups on r3/4/500s
  13. [CIFS] Add destroy routine for dns_resolver

    Jeff Layton authored Steve French committed
    Otherwise, we're leaking the payload memory.
    
    CC: Stable Kernel <stable@vger.kernel.org>
    Acked-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>
  14. @torvalds

    e1000: fix stack size

    torvalds authored
    Here's the patch. It shrinks the stack from 1152 bytes to 192 bytes (the
    first version, that only did the e1000_option part, got it down to 600
    bytes). About half comes from not using multiple "e1000_option"
    structures, the other half comes from turning the "e1000_opt_list[]"
    arrays into "static const" instead, so that gcc doesn't copy them onto the
    stack.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Reveiewed-by: Auke Kok <auke-jan.h.kok@intel.com>
    Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. @torvalds

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    torvalds authored
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      block: remove blk_queue_tag_depth() and blk_queue_tag_queue()
      block: remove unused ->busy part of the block queue tag map
      bio: fix __bio_copy_iov() handling of bio->bv_len
      bio: fix bio_copy_kern() handling of bio->bv_len
      block: submit_bh() inadvertently discards barrier flag on a sync write
      block: clean up cmdfilter sysfs interface
      block: rename blk_scsi_cmd_filter to blk_cmd_filter
      sg: restore command permission for TYPE_SCANNER
      block: move cmdfilter from gendisk to request_queue
  16. @torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/mfasheh/ocfs2
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
      ocfs2: Increment the reference count of an already-active stack.
      [PATCH] configfs: Consolidate locking around configfs_detach_prep() in configfs_rmdir()
      ocfs2: correctly set i_blocks after inline dir gets expanded
      ocfs2: Jump to correct label in ocfs2_expand_inline_dir()
      ocfs2: Fix sleep-with-spinlock recovery regression
      [PATCH] ocfs2/cluster/netdebug.c: fix warning
      [PATCH] ocfs2/cluster/tcp.c: make some functions static
  17. @torvalds

    Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linu…

    torvalds authored
    …x-2.6
    
    * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
      [S390] dcss: fix build bug.
      [S390] Fix linker script.
  18. @rostedt @torvalds

    ftrace: disable tracing for suspend to ram

    rostedt authored torvalds committed
    I've been painstakingly debugging the issue with suspend to ram and
    ftraced. The 2.6.28 code does not have this issue, but since the mcount
    recording is not going to be in 27, this must be solved for the ftrace
    daemon version.
    
    The resume from suspend to ram would reboot because it was triple
    faulting. Debugging further, I found that calling the mcount function
    itself was not an issue, but it would fault when it incremented
    preempt_count. preempt_count is on the tasks info structure that is on the
    low memory address of the task's stack.  For some reason, it could not
    write to it. Resuming out of suspend to ram does quite a lot of funny
    tricks to get to work, so it is not surprising at all that simply doing a
    preempt_disable() would cause a fault.
    
    Thanks to Rafael for suggesting to add a "while (1);" to find the place in
    resuming that is causing the fault. I would place the loop somewhere in
    the code, compile and reboot and see if it would either reboot (hit the
    fault) or simply hang (hit the loop).  Doing this over and over again, I
    narrowed it down that it was happening in enable_nonboot_cpus.
    
    At this point, I found that it is easier to simply disable tracing around
    the suspend code, instead of searching for the particular function that
    can not handle doing a preempt_disable.
    
    This patch disables the tracer as it suspends and reenables it on resume.
    
    I tested this patch on my Laptop, and it can resume fine with the patch.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.