Permalink
Commits on Jun 1, 2010
  1. Merge branch 'configs-2.6.34'

    Oleksandr Natalenko committed Jun 1, 2010
  2. configs-2.6.34: fix config for Dell Inspiron 1525

    Oleksandr Natalenko committed Jun 1, 2010
  3. Merge branch 'ck-2.6.34'

    Oleksandr Natalenko committed Jun 1, 2010
  4. ck-2.6.34: remove version tail

    Oleksandr Natalenko committed Jun 1, 2010
  5. Merge branch 'version-2.6.34'

    Oleksandr Natalenko committed Jun 1, 2010
  6. version-2.6.34: bump to v2.6.34-pf2

    Oleksandr Natalenko committed Jun 1, 2010
  7. fix merge conflict

    Oleksandr Natalenko committed Jun 1, 2010
  8. Merge branch 'configs-2.6.34' into 2.6.34-pfck

    Oleksandr Natalenko committed Jun 1, 2010
  9. configs-2.6.34: update config for Dell Inspiron 1525

    Oleksandr Natalenko committed Jun 1, 2010
  10. bump version to v2.6.34-pf2

    Oleksandr Natalenko committed Jun 1, 2010
  11. Merge branch 'configs-2.6.34' into 2.6.34-pfck

    Oleksandr Natalenko committed Jun 1, 2010
  12. Merge remote branch 'tuxonice-2.6.34' into 2.6.34-pfck

    Oleksandr Natalenko committed Jun 1, 2010
  13. Merge remote branch 'tuxonice-2.6.34' into 2.6.34-pfck

    Oleksandr Natalenko committed Jun 1, 2010
  14. merge 2.6.34-ck1

    Oleksandr Natalenko committed Jun 1, 2010
  15. Fix dev_t printk compile time warning.

    Nigel Cunningham committed Jun 1, 2010
    Fix the warnings produced by using %lx instead of just
    %x for printking dev_ts in the uuid code.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
  16. Rename TuxOnIce's uuid.h to fs_uuid.h

    Nigel Cunningham committed Jun 1, 2010
    Vanilla is gaining a uuid.h of it's own. To avoid conflicts,
    rename TuxOnIce's file to fs_uuid.h.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
  17. Better handling of duplicated UUIDs.

    Nigel Cunningham committed Jun 1, 2010
    Improve our handling of the situation where a user utilises dd
    to copy a partition, and doesn't change the UUID on the destination.
    Do this by using not just the UUID, but also the last mounted time
    and dev_t to try to match partitions, recording all of these pieces
    of information in image header when hibernating, and picking the
    best match at resume time. "Best" is defined as having all values
    matching in the ideal case, taking a partition with a matching
    UUID and last mount time as the next best match, and only falling
    back to taking the first UUID match if nothing better is found.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Commits on May 24, 2010
  1. Merge remote branch 'tuxonice-2.6.34'

    Oleksandr Natalenko committed May 24, 2010
Commits on May 23, 2010
  1. Ignore I/O errors in UUID checking.

    Nigel Cunningham committed May 23, 2010
    Our UUID code has until now BUGed if I/O fails when (for example)
    scanning for a resumable image. This means (on my computer at least)
    that if you start the computer with Charlie and Lola's Favourite
    and Best Music Record in the CD drive (great for your 2 yo, btw!),
    we hit the oops every time.
    
    This patch adds proper handling of I/O errors, so that Charlie and
    Lola can happily sit in the drive and we'll still scan other devices
    as per normal.
    
    Really, the most bestest and excellent solution that should have been
    done from the start. :)
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Commits on May 21, 2010
  1. Merge branch 'configs-2.6.34'

    Oleksandr Natalenko committed May 21, 2010
  2. configs-2.6.34: add config for Dell Inspiron 1525

    Oleksandr Natalenko committed May 21, 2010
  3. Merge branch 'version-2.6.34'

    Oleksandr Natalenko committed May 21, 2010
  4. version-2.6.34: bump to v2.6.34-pf1

    Oleksandr Natalenko committed May 21, 2010
  5. Merge remote branch 'tuxonice-2.6.34'

    Oleksandr Natalenko committed May 21, 2010
Commits on May 18, 2010
  1. bfs-2.6.34: added missed bfs v318 files

    Oleksandr Natalenko committed May 18, 2010
  2. bfs-2.6.34: added bfs v318

    Oleksandr Natalenko committed May 18, 2010
Commits on May 17, 2010
  1. Merge branch 'origin' into combined

    Nigel Cunningham committed May 17, 2010
Commits on May 16, 2010
  1. Linus 2.6.34

    torvalds committed May 16, 2010
  2. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds committed May 16, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      rtnetlink: make SR-IOV VF interface symmetric
      sctp: delete active ICMP proto unreachable timer when free transport
      tcp: fix MD5 (RFC2385) support
  3. Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…

    torvalds committed May 16, 2010
    …linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      MIPS: Oprofile: Fix Loongson irq handler
      MIPS: N32: Use compat version for sys_ppoll.
      MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1
  4. rtnetlink: make SR-IOV VF interface symmetric

    chriswright committed with davem330 May 16, 2010
    Now we have a set of nested attributes:
    
      IFLA_VFINFO_LIST (NESTED)
        IFLA_VF_INFO (NESTED)
          IFLA_VF_MAC
          IFLA_VF_VLAN
          IFLA_VF_TX_RATE
    
    This allows a single set to operate on multiple attributes if desired.
    Among other things, it means a dump can be replayed to set state.
    
    The current interface has yet to be released, so this seems like
    something to consider for 2.6.34.
    
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  5. sctp: delete active ICMP proto unreachable timer when free transport

    Wei Yongjun committed with davem330 May 9, 2010
    transport may be free before ICMP proto unreachable timer expire, so
    we should delete active ICMP proto unreachable timer when transport
    is going away.
    
    Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
    Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. tcp: fix MD5 (RFC2385) support

    Eric Dumazet committed with davem330 May 16, 2010
    TCP MD5 support uses percpu data for temporary storage. It currently
    disables preemption so that same storage cannot be reclaimed by another
    thread on same cpu.
    
    We also have to make sure a softirq handler wont try to use also same
    context. Various bug reports demonstrated corruptions.
    
    Fix is to disable preemption and BH.
    
    Reported-by: Bhaskar Dutta <bhaskie@gmail.com>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on May 15, 2010
  1. MIPS: Oprofile: Fix Loongson irq handler

    lzufalcon committed with ralfbaechle May 6, 2010
        
        The interrupt enable bit for the performance counters is in the Control
        Register $24, not in the counter register.
        loongson2_perfcount_handler(), we need to use
        
        Reported-by: Xu Hengyang <hengyang@mail.ustc.edu.cn>
        Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
        Cc: linux-mips@linux-mips.org
        Patchwork: http://patchwork.linux-mips.org/patch/1198/
        Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    
    ---
  2. MIPS: N32: Use compat version for sys_ppoll.

    Chandrakala Chavva committed with ralfbaechle May 11, 2010
        
        The sys_ppoll() takes struct 'struct timespec'. This is different for the
        N32 and N64 ABIs. Use the compat version to do the proper conversions.
        
        Signed-off-by: David Daney <ddaney@caviumnetworks.com>
        To: linux-mips@linux-mips.org
        Patchwork: http://patchwork.linux-mips.org/patch/1210/
        Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    
    ---