1. 12 Oct, 2008 4 commits
    • Adrian Bunk's avatar
      add key_revoke() dummy for KEYS=n · 0dab9cfa
      Adrian Bunk authored
      This fixes the following build error with CONFIG_KEYS=n, caused by
      commit dfd15c46 ("cifs: explicitly
      revoke SPNEGO key after session setup"):
      
          CC [M]  fs/cifs/sess.o
        fs/cifs/sess.c: In function 'CIFS_SessSetup':
        fs/cifs/sess.c:628: error: implicit declaration of function 'key_revoke'
        make[3]: *** [fs/cifs/sess.o] Error 1
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Acked-by: default avatarJeff Layton <jlayton@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0dab9cfa
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 · 07104839
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (180 commits)
        leo: disable cursor when leaving graphics mode
        cg6: disable cursor when leaving graphics mode
        sparc32: sun4m interrupt mask cleanup
        drivers/rtc/Kconfig: don't build rtc-cmos.o on sparc32
        sparc: arch/sparc/kernel/pmc.c -- extra #include?
        sparc32: Add more extensive documentation of sun4m interrupts.
        sparc32: Kill irq_rcvreg from sun4m_irq.c
        sparc32: Delete master_l10_limit.
        sparc32: Use PROM device probing for sun4c timers.
        sparc32: Use PROM device probing for sun4c interrupt register.
        sparc32: Delete claim_ticker14().
        sparc32: Stop calling claim_ticker14() from sun4c_irq.c
        sparc32: Kill clear_profile_irq btfixup entry.
        sparc32: Call sun4m_clear_profile_irq() directly from sun4m_smp.c
        sparc32: Remove #if 0'd code from sun4c_irq.c
        sparc32: Remove some SMP ifdefs in sun4d_irq.c
        sparc32: Use PROM infrastructure for probing and mapping sun4d timers.
        sparc32: Use PROM device probing for sun4m irq registers.
        sparc32: Use PROM device probing for sun4m timer registers.
        sparc: Fix user_regset 'n' field values.
        ...
      07104839
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 589acce5
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        smc911x: Fix external PHY detection
        e1000: allow VLAN devices to use TSO and CSUM offload
        gre: Initialise rtnl_link tunnel parameters properly
        ipvs: Add proper dependencies on IP_VS, and fix description header line.
      589acce5
    • Linus Torvalds's avatar
      Fix RTC wakealarm sysfs interface breakage. · 1efd325f
      Linus Torvalds authored
      Commit ed458df4 ("PnP: move
      pnpacpi/pnpbios_init to after PCI init") moved the PnP RTC discovery
      later, and now the ACPI RTC glue code doesn't find it any more, breaking
      the RTC wakealarm sysfs interfaces, as reported by Rafael.
      
      This really is fairly messy, and we have several annoying ordering
      constraints here - the PnP code that sets up the RTC resources wants to
      run after the PCI resources have to be registered, which in turn needs
      to run after ACPI has at least enumerated the root PCI buses etc.  Our
      initcall ordering is not fine-grained enough to make this all painless.
      
      So this moves the ACPI RTC glue ("acpi_rtc_init()") down to a regular
      module call, which fixes the problem Rafael has.  The reason this isn't
      wonderful is that we really should do acpi_rtc_init before we do the
      rtc_cmos init, and now those two are in the same module_init() section.
      
      Which happens to work, but only because drivers/rtc is linked after
      drivers/acpi.  In other words, we still have a very subtle ordering
      issue here. Grr.
      Reported-and-tested-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      Acked-by: default avatarDavid Brownell <david-b@pacbell.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1efd325f
  2. 11 Oct, 2008 36 commits