1. 09 Mar, 2007 34 commits
  2. 07 Mar, 2007 6 commits
    • Linus Torvalds's avatar
      Linux 2.6.21-rc3 · 08e15e81
      Linus Torvalds authored
      .. hopefully most of the resume/suspend problems introduced by the timer
      and other changes are behind us.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      08e15e81
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 2f774456
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Fix floppy build failure.
      2f774456
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 5b3c1184
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [DCCP]: Set RTO for newly created child socket
        [DCCP]: Correctly split CCID half connections
        [NET]: Fix compat_sock_common_getsockopt typo.
        [NET]: Revert incorrect accept queue backlog changes.
        [INET]: twcal_jiffie should be unsigned long, not int
        [GIANFAR]: Fix compile error in latest git
        [PPPOE]: Use ifindex instead of device pointer in key lookups.
        [NETFILTER]: ip6_route_me_harder should take into account mark
        [NETFILTER]: nfnetlink_log: fix reference counting
        [NETFILTER]: nfnetlink_log: fix module reference counting
        [NETFILTER]: nfnetlink_log: fix possible NULL pointer dereference
        [NETFILTER]: nfnetlink_log: fix NULL pointer dereference
        [NETFILTER]: nfnetlink_log: fix use after free
        [NETFILTER]: nfnetlink_log: fix reference leak
        [NETFILTER]: tcp conntrack: accept SYN|URG as valid
        [NETFILTER]: nf_conntrack/nf_nat: fix incorrect config ifdefs
        [NETFILTER]: conntrack: fix {nf,ip}_ct_iterate_cleanup endless loops
      5b3c1184
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · fe1b4ba4
      Linus Torvalds authored
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] cio: Call cancel_halt_clear even when actl == 0.
        [S390] cio: Use path verification to check for path state.
        [S390] cio: Fix locking when calling notify function.
        [S390] Fixed handling of access register mode faults.
        [S390] dasd: Use default recovery for SNSS requests
        [S390] check_bugs() should be inline.
        [S390] tape: Compression overwrites crypto setting
        [S390] nss: disable kexec.
        [S390] reipl: move dump_prefix_page out of text section.
        [S390] smp: disable preemption in smp_call_function/smp_call_function_on
        [S390] kprobes breaks BUG_ON
      fe1b4ba4
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · ae5dd8e3
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        pata_pdc202xx_old: fix data corruption and other problems
        pata_legacy: fix io/irq mismatch
        ahci: RAID mode SATA patch for Intel ICH9M
      ae5dd8e3
    • Linus Torvalds's avatar
      Revert "[PATCH] LOG2: Alter get_order() so that it can make use of ilog2() on a constant" · 38f33230
      Linus Torvalds authored
      This reverts commit 39d61db0.
      
      The commit was buggy in multiple ways:
       - the conversion to ilog2() was incorrect to begin with
       - it tested the wrong #defines, so on all architectures but FRV you'd
         never see the bug except for constant arguments.
       - the new "get_order()" macro used its arguments multiple times, and
         didn't even parenthesize them properly
       - despite the comments, it was not true that you could use it for
         constant initializers, since not all architectures even use the
         generic page.h header file.
      
      All of the problems are individually fixable, but it all boils down to:
      better just revert it, and re-do it from scratch.
      
      Cc: David Howells <dhowells@redhat.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Andrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      38f33230