1. 10 Oct, 2008 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.28' of git://git.kernel.dk/linux-2.6-block · e26feff6
      Linus Torvalds authored
      * 'for-2.6.28' of git://git.kernel.dk/linux-2.6-block: (132 commits)
        doc/cdrom: Trvial documentation error, file not present
        block_dev: fix kernel-doc in new functions
        block: add some comments around the bio read-write flags
        block: mark bio_split_pool static
        block: Find bio sector offset given idx and offset
        block: gendisk integrity wrapper
        block: Switch blk_integrity_compare from bdev to gendisk
        block: Fix double put in blk_integrity_unregister
        block: Introduce integrity data ownership flag
        block: revert part of d7533ad0e132f92e75c1b2eb7c26387b25a583c1
        bio.h: Remove unused conditional code
        block: remove end_{queued|dequeued}_request()
        block: change elevator to use __blk_end_request()
        gdrom: change to use __blk_end_request()
        memstick: change to use __blk_end_request()
        virtio_blk: change to use __blk_end_request()
        blktrace: use BLKTRACE_BDEV_SIZE as the name size for setup structure
        block: add lld busy state exporting interface
        block: Fix blk_start_queueing() to not kick a stopped queue
        include blktrace_api.h in headers_install
    • Linus Torvalds's avatar
      Merge phase #1 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · d403a648
      Linus Torvalds authored
      This merges phase 1 of the x86 tree, which is a collection of branches:
        x86/alternatives, x86/cleanups, x86/commandline, x86/crashdump,
        x86/debug, x86/defconfig, x86/doc, x86/exports, x86/fpu, x86/gart,
        x86/idle, x86/mm, x86/mtrr, x86/nmi-watchdog, x86/oprofile,
        x86/paravirt, x86/reboot, x86/sparse-fixes, x86/tsc, x86/urgent and
      and as Ingo says: "these are the easiest, purely independent x86 topics
      with no conflicts, in one nice Octopus merge".
      * 'x86-v28-for-linus-phase1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (147 commits)
        x86: mtrr_cleanup: treat WRPROT as UNCACHEABLE
        x86: mtrr_cleanup: first 1M may be covered in var mtrrs
        x86: mtrr_cleanup: print out correct type v2
        x86: trivial printk fix in efi.c
        x86, debug: mtrr_cleanup print out var mtrr before change it
        x86: mtrr_cleanup try gran_size to less than 1M, v3
        x86: mtrr_cleanup try gran_size to less than 1M, cleanup
        x86: change MTRR_SANITIZER to def_bool y
        x86, debug printouts: IOMMU setup failures should not be KERN_ERR
        x86: export set_memory_ro and set_memory_rw
        x86: mtrr_cleanup try gran_size to less than 1M
        x86: mtrr_cleanup prepare to make gran_size to less 1M
        x86: mtrr_cleanup safe to get more spare regs now
        x86_64: be less annoying on boot, v2
        x86: mtrr_cleanup hole size should be less than half of chunk_size, v2
        x86: add mtrr_cleanup_debug command line
        x86: mtrr_cleanup optimization, v2
        x86: don't need to go to chunksize to 4G
        x86_64: be less annoying on boot
        x86, olpc: fix endian bug in openfirmware workaround
    • Linus Torvalds's avatar
      PnP: move pnpacpi/pnpbios_init to after PCI init · ed458df4
      Linus Torvalds authored
      We already did that a long time ago for pnp_system_init, but
      pnpacpi_init and pnpbios_init remained as subsys_initcalls, and get
      linked into the kernel before the arch-specific routines that finalize
      the PCI resources (pci_subsys_init).
      This means that the PnP routines would either register their resources
      before the PCI layer could, or would be unable to check whether a PCI
      resource had already been registered.  Both are problematic.
      I wanted to do this before 2.6.27, but every time we change something
      like this, something breaks.  That said, _every_ single time we trust
      some firmware (like PnP tables) more than we trust the hardware itself
      (like PCI probing), the problems have been worse.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'upstream-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 82219fce
      Linus Torvalds authored
      * 'upstream-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        ata_piix: IDE Mode SATA patch for Intel Ibex Peak DeviceIDs
        libata-eh: clear UNIT ATTENTION after reset
        ata_piix: add Hercules EC-900 mini-notebook to ich_laptop short cable list
        libata: reorder ata_device to remove 8 bytes of padding on 64 bits
        [libata] pata_bf54x: Add proper PM operation
        pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
        libata: Implement disk shock protection support
        [libata] Introduce ata_id_has_unload()
        PATA: RPC now selects HAVE_PATA_PLATFORM for pata platform driver
        ata_piix: drop merged SCR access and use slave_link instead
        libata: implement slave_link
        libata: misc updates to prepare for slave link
        libata: reimplement link iterator
        libata: make SCR access ops per-link
    • Randy Dunlap's avatar
      doc/cdrom: Trvial documentation error, file not present · b911e473
      Randy Dunlap authored
      The sbpcd tester program is not included in the kernel source tree,
      so remove the reference to it.
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Reported-by: default avatarNick Warne <nick@ukfsn.org>
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
  2. 09 Oct, 2008 35 commits