1. 19 Sep, 2007 17 commits
  2. 17 Sep, 2007 8 commits
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · c2f82897
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
        ACPI: thinkpad-acpi: bump up version to 0.16
        ACPI: thinkpad-acpi: revert new 2.6.23 CONFIG_THINKPAD_ACPI_INPUT_ENABLED option
        ACPI: fix CONFIG_NET=n acpi_bus_generate_netlink_event build failure
        msi-laptop: replace ',' with ';'
        ACPI: (more) delete CONFIG_ACPI_PROCFS_SLEEP (again)
      c2f82897
    • Len Brown's avatar
      Pull thinkpad into release branch · ecfe7f09
      Len Brown authored
      ecfe7f09
    • Henrique de Moraes Holschuh's avatar
      ACPI: thinkpad-acpi: bump up version to 0.16 · 3b0c6485
      Henrique de Moraes Holschuh authored
      Name it thinkpad-acpi version 0.16 to avoid any confusion with some 0.15
      thinkpad-acpi development snapshots and backports that had input layer
      support, but no hotkey_report_mode support.
      Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      3b0c6485
    • Henrique de Moraes Holschuh's avatar
      ACPI: thinkpad-acpi: revert new 2.6.23 CONFIG_THINKPAD_ACPI_INPUT_ENABLED option · ff80f137
      Henrique de Moraes Holschuh authored
      Revert new 2.6.23 CONFIG_THINKPAD_ACPI_INPUT_ENABLED Kconfig option because
      it would create a legacy we don't want to support.
      
      CONFIG_THINKPAD_ACPI_INPUT_ENABLED was added to try to fix an issue that is
      now moot with the addition of the netlink ACPI event report interface to
      the ACPI core.
      
      Now that ACPI core can send events over netlink, we can use a different
      strategy to keep backwards compatibility with older userspace, without the
      need for the CONFIG_THINKPAD_ACPI_INPUT_ENABLED games.  And it arrived
      before CONFIG_THINKPAD_ACPI_INPUT_ENABLED made it to a stable mainline
      kernel, even, which is Good.
      
      This patch is in sync with some changes to thinkpad-acpi backports, that
      will keep things sane for userspace across different combinations of kernel
      versions, thinkpad-acpi backports (or the lack thereof), and userspace
      capabilities:
      
      Unless a module parameter is used, thinkpad-acpi will now behave in such a
      way that it will work well (by default) with userspace that still uses only
      the old ACPI procfs event interface and doesn't care for thinkpad-acpi
      input devices.
      
      It will also always work well with userspace that has been updated to use
      both the thinkpad-acpi input devices, and ACPI core netlink event
      interface, regardless of any module parameter.
      
      The module parameter was added to allow thinkpad-acpi to work with
      userspace that has been partially updated to use thinkpad-acpi input
      devices, but not the new ACPI core netlink event interface.  To use this
      mode of hot key reporting, one has to specify the hotkey_report_mode=2
      module parameter.
      
      The thinkpad-acpi driver exports the value of hotkey_report_mode through
      sysfs, as well.  thinkpad-acpi backports to older kernels, that do not
      support the new ACPI core netlink interface, have code to allow userspace
      to switch hotkey_report_mode at runtime through sysfs.  This capability
      will not be provided in mainline thinkpad-acpi as it is not needed there.
      Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
      Cc: Michael S. Tsirkin <mst@dev.mellanox.co.il>
      Cc: Hugh Dickins <hugh@veritas.com>
      Cc: Richard Hughes <hughsient@gmail.com>
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      ff80f137
    • Len Brown's avatar
      Pull misc into release branch · 95e3f66f
      Len Brown authored
      95e3f66f
    • Linus Torvalds's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 6553daea
      Linus Torvalds authored
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Warn user if cpu is ignored.
        [SPARC64]: Fix lockdep, particularly on SMP.
        [SPARC64]: Update defconfig.
      6553daea
    • Linus Torvalds's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · edb1e967
      Linus Torvalds authored
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [VLAN]: Fix net_device leak.
        [PPP] generic: Fix receive path data clobbering & non-linear handling
        [PPP] generic: Call skb_cow_head before scribbling over skb
        [NET] skbuff: Add skb_cow_head
        [BRIDGE]: Kill clone argument to br_flood_*
        [PPP] pppoe: Fill in header directly in __pppoe_xmit
        [PPP] pppoe: Fix data clobbering in __pppoe_xmit and return value
        [PPP] pppoe: Fix skb_unshare_check call position
        [SCTP]: Convert bind_addr_list locking to RCU
        [SCTP]: Add RCU synchronization around sctp_localaddr_list
        [PKT_SCHED]: sch_cbq.c: Shut up uninitialized variable warning
        [PKTGEN]: srcmac fix
        [IPV6]: Fix source address selection.
        [IPV4]: Just increment OutDatagrams once per a datagram.
        [IPV6]: Just increment OutDatagrams once per a datagram.
        [IPV6]: Fix unbalanced socket reference with MSG_CONFIRM.
        [NET_SCHED] protect action config/dump from irqs
        [NET]: Fix two issues wrt. SO_BINDTODEVICE.
      edb1e967
    • Matthew Wilcox's avatar
      Fix non-ISA link error in drivers/scsi/advansys.c · fa890d58
      Matthew Wilcox authored
      When CONFIG_ISA is disabled, the isa_driver support will not be compiled
      in.  Define stubs so that we don't get link-time errors.
      Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fa890d58
  3. 16 Sep, 2007 15 commits