1. 11 10月, 2008 29 次提交
    • R
      Staging: go7007 v4l fixes · df20d69e
      Ross Cohen 提交于
      Fix up some of the v4l issues that were recently changed to make the
      go7007 driver a bit cleaner.
      
      
      From: Ross Cohen <rcohen@snurgle.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      df20d69e
    • J
      Staging: Fix gcc warnings in sxg · d63d692a
      J.R. Mauro 提交于
      Fix for compiler warning about format specifier in prints in
      drivers/staging/sxg/sxg.c
      Prints were using %x to print unsigned long data.
      Signed-off-by: NJ.R. Mauro <jrm8005@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      d63d692a
    • D
      Staging: add echo cancelation module · 10602db8
      David Rowe 提交于
      This is used by mISDN and Zaptel drivers.
      
      From: Steve Underwood <steveu@coppice.org>
      From: David Rowe <david@rowetel.com>
      Cc: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      10602db8
    • G
      Staging: add wlan-ng prism2 usb driver · 00b3ed16
      Greg Kroah-Hartman 提交于
      This adds the wlan-ng prism2 USB driver to the drivers/staging tree.
      
      The code was originally written by the linux-wlan-ng team, patched by
      some Novell engineers to properly work on newer kernels, and then hacked
      into place in order to get it to build properly in a single subdirectory
      within the kernel tree by me.
      
      It supports a wide range of older USB prism2 devices, and contains a
      80211 stack to support this single driver.
      
      Cc: Christian Zoz <zoz@suse.de>
      Cc: Andreas Gruenbacher <agruen@suse.de>
      Cc: linux-wireless <linux-wireless@vger.kernel.org>
      Cc: John Linville <linville@tuxdriver.com>
      Cc: Helmut Schaa <helmut.schaa@googlemail.com>
      Cc: linux-wlan-ng <solomon@linux-wlan.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      
      00b3ed16
    • P
      Staging: add w35und wifi driver · 66101de1
      Pavel Machek 提交于
      This is driver for w35und usb wifi -- also in kohjinsha
      subnotebook. It should work well enough to associate and ping, but it
      obviously needs to be rewritten two more times...
      
      OTOH worst horrors (like embedded wifi stack) should have been fixed
      already...
      Signed-off-by: NPavel Machek <pavel@suse.cz>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      66101de1
    • T
      Staging: USB/IP: add host driver · 4d7b5c7f
      Takahiro Hirofuchi 提交于
      This adds the USB IP client driver
      
      Brian Merrell cleaned up a lot of this code and submitted it for
      inclusion.  Greg also did a lot of cleanup.
      Signed-off-by: NBrian G. Merrell <bgmerrell@novell.com>
      Cc: Takahiro Hirofuchi <hirofuchi@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      4d7b5c7f
    • T
      Staging: USB/IP: add client driver · 04679b34
      Takahiro Hirofuchi 提交于
      This adds the USB IP client driver
      
      Brian Merrell cleaned up a lot of this code and submitted it for
      inclusion.  Greg also did a lot of cleanup.
      Signed-off-by: NBrian G. Merrell <bgmerrell@novell.com>
      Cc: Takahiro Hirofuchi <hirofuchi@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      04679b34
    • T
      Staging: USB/IP: add common functions needed · 05a1f28e
      Takahiro Hirofuchi 提交于
      This adds the common functions needed by both the host and client side
      of the USB/IP code.
      
      Brian Merrell cleaned up a lot of this code and submitted it for
      inclusion.  Greg also did a lot of cleanup.
      Signed-off-by: NBrian G. Merrell <bgmerrell@novell.com>
      Cc: Takahiro Hirofuchi <hirofuchi@users.sourceforge.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      05a1f28e
    • G
      Staging: add the go7007 video driver · 866b8695
      Greg Kroah-Hartman 提交于
      Todo:
      	- checkpatch.pl cleanups
      	- sparse cleanups
      	- lots of little modules, should be merged together
      	  and added to the build.
      	- testing?
      	- handle churn in v4l layer.
      
      Many thanks to Ross Cohen <rcohen@snurgle.org> for cleanup patches on
      this driver.
      
      Cc: Ross Cohen <rcohen@snurgle.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      866b8695
    • G
      Staging: add me4000 pci data collection driver · c0f00588
      Greg Kroah-Hartman 提交于
      Originally written by Guenter Gebhardt <g.gebhardt@meilhaus.de>
      
      TODO:
      	- checkpatch.pl cleanups
      	- sparse cleanups
      	- possible /proc interaction cleanups
      	- more info needed for Kconfig entry
      	- real device id?
      	- module parameter cleanup
      
      Cc: Wolfgang Beiter <w.beiter@aon.at>
      Cc: Guenter Gebhardt <g.gebhardt@meilhaus.de>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      c0f00588
    • G
      Staging: add me4000 firmware files · cff338a9
      Greg Kroah-Hartman 提交于
      Originally written by Guenter Gebhardt <g.gebhardt@meilhaus.de>
      
      TODO:
      	move this to the request_firmware() interface
      
      Cc: Wolfgang Beiter <w.beiter@aon.at>
      Cc: Guenter Gebhardt <g.gebhardt@meilhaus.de>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      cff338a9
    • G
      Staging: add sxg network driver · 5db6b777
      Greg Kroah-Hartman 提交于
      This is the first rough cut at a driver for the Alacritech SLIC
      Technology Non-Accelerated 10Gbe network driver
      
      TODO:
        - lindent the code
        - remove typedefs
        - remove wrappers
        - checkpatch.pl cleanups
        - new functionality that the card needs
      
      Cc: Christopher Harrer <charrer@alacritech.com>
      Cc: Michael Miles <mmiles@alacritech.com>
      Cc: Christopher Harrer <charrer@alacritech.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      5db6b777
    • G
      Staging: add Alacritech slicoss network driver · 4d6f6af8
      Greg Kroah-Hartman 提交于
      This adds the Alacritech slicoss driver to the tree.
      
      This driver is supposed to support:
      
      	Mojave cards (single port PCI Gigabit) both copper and fiber
      	Oasis cards (single and dual port PCI-x Gigabit) copper and fiber
      	Kalahari cards (dual and quad port PCI-e Gigabit) copper and fiber
      
      The driver was acutally tested on Oasis and Kalahari cards.
      
      TODO:
      	- move firmware loading to request_firmware()
      	- remove direct memory access of structures
      	- any remaining sparse and checkpatch.pl warnings
      	- any netdev recommended changes
      
      Many thanks to Lior Dotan <liodot@gmail.com> for help with the cleanup
      of this driver.
      
      Cc: Lior Dotan <liodot@gmail.com>
      Cc: Christopher Harrer <charrer@alacritech.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      4d6f6af8
    • G
      Staging: add et131x network driver · cfb739b4
      Greg Kroah-Hartman 提交于
      This is a driver for the ET1310 network device.
      
      Based on the driver found at https://sourceforge.net/projects/et131x/
      
      Cleaned up immensely by Olaf Hartman <o.hartmann@telovital.com> and Christoph
      Hellwig <hch@infradead.org>
      
      Note, the powermanagement options were removed from the vendor provided
      driver as they did not build properly at the time.
      
      TODO:
      	- kernel coding style cleanups
      	- forward port for latest network driver changes
      	- kill useless typecasts (e.g. in et1310_phy.c)
      	- alloc_etherdev is initializing memory with zero?!?
      	- add_timer call in et131x_netdev.c is correct?
      	- Add power saving functionality (suspend, sleep, resume)
      	- Implement a few more kernel Parameter (set mac )
      
      Cc: Olaf Hartmann <o.hartmann@telovital.com>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Dean Adams <dadams1969@gmail.com>
      Cc: Victor Soriano <vjsoriano@agere.com>
      Cc: Andre-Sebastian Liebe <andre@lianse.eu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      cfb739b4
    • G
      Staging: add MAINTAINERS entry · dbc6c2cc
      Greg Kroah-Hartman 提交于
      Someone has to claim this mess, might as well let everyone know who to
      blame.
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      dbc6c2cc
    • G
      Staging: add Kconfig entries and Makefile infrastructure · 35045589
      Greg Kroah-Hartman 提交于
      This hooks up the drivers/staging directory to the build system
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      35045589
    • G
      Staging: add TAINT_CRAP flag to drivers/staging modules · a9860bf0
      Greg Kroah-Hartman 提交于
      We need to add a flag for all code that is in the drivers/staging/
      directory to prevent all other kernel developers from worrying about
      issues here, and to notify users that the drivers might not be as good
      as they are normally used to.
      
      Based on code from Andreas Gruenbacher and Jeff Mahoney to provide a
      TAINT flag for the support level of a kernel module in the Novell
      enterprise kernel release.
      
      This is the code that actually modifies the modules, adding the flag to
      any files in the drivers/staging directory.
      
      Cc: Andreas Gruenbacher <agruen@suse.de>
      Cc: Jeff Mahoney <jeffm@suse.de>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      a9860bf0
    • G
      Staging: add TAINT_CRAP for all drivers/staging code · 061b1bd3
      Greg Kroah-Hartman 提交于
      We need to add a flag for all code that is in the drivers/staging/
      directory to prevent all other kernel developers from worrying about
      issues here, and to notify users that the drivers might not be as good
      as they are normally used to.
      
      Based on code from Andreas Gruenbacher and Jeff Mahoney to provide a
      TAINT flag for the support level of a kernel module in the Novell
      enterprise kernel release.
      
      This is the kernel portion of this feature, the ability for the flag to
      be set needs to be done in the build process and will happen in a
      follow-up patch.
      
      Cc: Andreas Gruenbacher <agruen@suse.de>
      Cc: Jeff Mahoney <jeffm@suse.de>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      061b1bd3
    • L
      Merge branch 'rcu-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · b922df73
      Linus Torvalds 提交于
      * 'rcu-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (21 commits)
        rcu: RCU-based detection of stalled CPUs for Classic RCU, fix
        rcu: RCU-based detection of stalled CPUs for Classic RCU
        rcu: add rcu_read_lock_sched() / rcu_read_unlock_sched()
        rcu: fix sparse shadowed variable warning
        doc/RCU: fix pseudocode in rcuref.txt
        rcuclassic: fix compiler warning
        rcu: use irq-safe locks
        rcuclassic: fix compilation NG
        rcu: fix locking cleanup fallout
        rcu: remove redundant ACCESS_ONCE definition from rcupreempt.c
        rcu: fix classic RCU locking cleanup lockdep problem
        rcu: trace fix possible mem-leak
        rcu: just rename call_rcu_bh instead of making it a macro
        rcu: remove list_for_each_rcu()
        rcu: fixes to include/linux/rcupreempt.h
        rcu: classic RCU locking and memory-barrier cleanups
        rcu: prevent console flood when one CPU sees another AWOL via RCU
        rcu, debug: detect stalled grace periods, cleanups
        rcu, debug: detect stalled grace periods
        rcu classic: new algorithm for callbacks-processing(v2)
        ...
      b922df73
    • L
      Merge branch 'for-linus' of... · c54dcd8e
      Linus Torvalds 提交于
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
        selinux: Fix an uninitialized variable BUG/panic in selinux_secattr_to_sid()
        selinux: use default proc sid on symlinks
        file capabilities: uninline cap_safe_nice
        Update selinux info in MAINTAINERS and Kconfig help text
        SELinux: add gitignore file for mdp script
        SELinux: add boundary support and thread context assignment
        securityfs: do not depend on CONFIG_SECURITY
        selinux: add support for installing a dummy policy (v2)
        security: add/fix security kernel-doc
        selinux: Unify for- and while-loop style
        selinux: conditional expression type validation was off-by-one
        smack: limit privilege by label
        SELinux: Fix a potentially uninitialised variable in SELinux hooks
        SELinux: trivial, remove unneeded local variable
        SELinux: Trivial minor fixes that change C null character style
        make selinux_write_opts() static
      c54dcd8e
    • L
      Merge branch 'sched-v28-for-linus' of... · b11ce8a2
      Linus Torvalds 提交于
      Merge branch 'sched-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (38 commits)
        sched debug: add name to sched_domain sysctl entries
        sched: sync wakeups vs avg_overlap
        sched: remove redundant code in cpu_cgroup_create()
        sched_rt.c: resch needed in rt_rq_enqueue() for the root rt_rq
        cpusets: scan_for_empty_cpusets(), cpuset doesn't seem to be so const
        sched: minor optimizations in wake_affine and select_task_rq_fair
        sched: maintain only task entities in cfs_rq->tasks list
        sched: fixup buddy selection
        sched: more sanity checks on the bandwidth settings
        sched: add some comments to the bandwidth code
        sched: fixlet for group load balance
        sched: rework wakeup preemption
        CFS scheduler: documentation about scheduling policies
        sched: clarify ifdef tangle
        sched: fix list traversal to use _rcu variant
        sched: turn off WAKEUP_OVERLAP
        sched: wakeup preempt when small overlap
        kernel/cpu.c: create a CPU_STARTING cpu_chain notifier
        kernel/cpu.c: Move the CPU_DYING notifiers
        sched: fix __load_balance_iterator() for cfq with only one task
        ...
      b11ce8a2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · f6bccf69
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: skcipher - Use RNG interface instead of get_random_bytes
        crypto: rng - RNG interface and implementation
        crypto: api - Add fips_enable flag
        crypto: skcipher - Move IV generators into their own modules
        crypto: cryptomgr - Test ciphers using ECB
        crypto: api - Use test infrastructure
        crypto: cryptomgr - Add test infrastructure
        crypto: tcrypt - Add alg_test interface
        crypto: tcrypt - Abort and only log if there is an error
        crypto: crc32c - Use Intel CRC32 instruction
        crypto: tcrypt - Avoid using contiguous pages
        crypto: api - Display larval objects properly
        crypto: api - Export crypto_alg_lookup instead of __crypto_alg_lookup
        crypto: Kconfig - Replace leading spaces with tabs
      f6bccf69
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 3af73d39
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (29 commits)
        RDMA/nes: Fix slab corruption
        IB/mlx4: Set RLKEY bit for kernel QPs
        RDMA/nes: Correct error_module bit mask
        RDMA/nes: Fix routed RDMA connections
        RDMA/nes: Enhanced PFT management scheme
        RDMA/nes: Handle AE bounds violation
        RDMA/nes: Limit critical error interrupts
        RDMA/nes: Stop spurious MAC interrupts
        RDMA/nes: Correct tso_wqe_length
        RDMA/nes: Fill in firmware version for ethtool
        RDMA/nes: Use ethtool timer value
        RDMA/nes: Correct MAX TSO frags value
        RDMA/nes: Enable MC/UC after changing MTU
        RDMA/nes: Free NIC TX buffers when destroying NIC QP
        RDMA/nes: Fix MDC setting
        RDMA/nes: Add wqm_quanta module option
        RDMA/nes: Module parameter permissions
        RDMA/cxgb3: Set active_mtu in ib_port_attr
        RDMA/nes: Add support for 4-port 1G HP blade card
        RDMA/nes: Make mini_cm_connect() static
        ...
      3af73d39
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · 13dd7f87
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: choose better identifiers
        dlm: remove bkl
        dlm: fix address compare
        dlm: fix locking of lockspace list in dlm_scand
        dlm: detect available userspace daemon
        dlm: allow multiple lockspace creates
      13dd7f87
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm · b0af205a
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
        dm: detect lost queue
        dm: publish dm_vcalloc
        dm: publish dm_table_unplug_all
        dm: publish dm_get_mapinfo
        dm: export struct dm_dev
        dm crypt: avoid unnecessary wait when splitting bio
        dm crypt: tidy ctx pending
        dm crypt: fix async inc_pending
        dm crypt: move dec_pending on error into write_io_submit
        dm crypt: remove inc_pending from write_io_submit
        dm crypt: tidy write loop pending
        dm crypt: tidy crypt alloc
        dm crypt: tidy inc pending
        dm exception store: use chunk_t for_areas
        dm exception store: introduce area_location function
        dm raid1: kcopyd should stop on error if errors handled
        dm mpath: remove is_active from struct dm_path
        dm mpath: use more error codes
      
      Fixed up trivial conflict in drivers/md/dm-mpath.c manually.
      b0af205a
    • C
      Fix barrier fail detection in XFS · 73f6aa4d
      Christoph Hellwig 提交于
      Currently we disable barriers as soon as we get a buffer in xlog_iodone
      that has the XBF_ORDERED flag cleared.  But this can be the case not only
      for buffers where the barrier failed, but also the first buffer of a
      split log write in case of a log wraparound.  Due to the disabled
      barriers we can easily get directory corruption on unclean shutdowns.
      So instead of using this check add a new buffer flag for failed barrier
      writes.
      
      This is a regression vs 2.6.26 caused by patch to use the right macro
      to check for the ORDERED flag, as we previously got true returned for
      every buffer.
      
      Thanks to Toei Rei for reporting the bug.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Reviewed-by: NEric Sandeen <sandeen@sandeen.net>
      Reviewed-by: NDavid Chinner <david@fromorbit.com>
      Signed-off-by: NTim Shimmin <tes@sgi.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      73f6aa4d
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 445e1ced
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
        GFS2: Support for I/O barriers
        GFS2: Add UUID to GFS2 sb
        GFS2: high time to take some time over atime
        GFS2: The war on bloat
        GFS2: GFS2 will panic if you misspell any mount options
        GFS2: Direct IO write at end of file error
        GFS2: Use an IS_ERR test rather than a NULL test
        GFS2: Fix race relating to glock min-hold time
        GFS2: Fix & clean up GFS2 rename
        GFS2: rm on multiple nodes causes panic
        GFS2: Fix metafs mounts
        GFS2: Fix debugfs glock file iterator
      445e1ced
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · ef5bef35
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (37 commits)
        [SCSI] zfcp: fix double dbf id usage
        [SCSI] zfcp: wait on SCSI work to be finished before proceeding with init dev
        [SCSI] zfcp: fix erp list usage without using locks
        [SCSI] zfcp: prevent fc_remote_port_delete calls for unregistered rport
        [SCSI] zfcp: fix deadlock caused by shared work queue tasks
        [SCSI] zfcp: put threshold data in hba trace
        [SCSI] zfcp: Simplify zfcp data structures
        [SCSI] zfcp: Simplify get_adapter_by_busid
        [SCSI] zfcp: remove all typedefs and replace them with standards
        [SCSI] zfcp: attach and release SAN nameserver port on demand
        [SCSI] zfcp: remove unused references, declarations and flags
        [SCSI] zfcp: Update message with input from review
        [SCSI] zfcp: add queue_full sysfs attribute
        [SCSI] scsi_dh: suppress comparison warning
        [SCSI] scsi_dh: add Dell product information into rdac device handler
        [SCSI] qla2xxx: remove the unused SCSI_QLOGIC_FC_FIRMWARE option
        [SCSI] qla2xxx: fix printk format warnings
        [SCSI] qla2xxx: Update version number to 8.02.01-k8.
        [SCSI] qla2xxx: Ignore payload reserved-bits during RSCN processing.
        [SCSI] qla2xxx: Additional residual-count corrections during UNDERRUN handling.
        ...
      ef5bef35
    • L
      Merge branch 'for-2.6.28' of git://git.kernel.dk/linux-2.6-block · e26feff6
      Linus Torvalds 提交于
      * '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
        ...
      e26feff6
  2. 10 10月, 2008 11 次提交
    • L
      Merge phase #1 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · d403a648
      Linus Torvalds 提交于
      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
        x86/vmalloc
      
      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
        ...
      d403a648
    • L
      PnP: move pnpacpi/pnpbios_init to after PCI init · ed458df4
      Linus Torvalds 提交于
      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: NLinus Torvalds <torvalds@linux-foundation.org>
      ed458df4
    • L
      Merge branch 'upstream-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 82219fce
      Linus Torvalds 提交于
      * '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
      82219fce
    • A
      dm: detect lost queue · 0c2322e4
      Alasdair G Kergon 提交于
      Detect and report buggy drivers that destroy their request_queue.
      Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
      Cc: Stefan Raspl <raspl@linux.vnet.ibm.com>
      Cc: Jens Axboe <jens.axboe@oracle.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      0c2322e4
    • M
      dm: publish dm_vcalloc · 54160904
      Mikulas Patocka 提交于
      Publish dm_vcalloc in include/linux/device-mapper.h because this function is
      used by targets.
      Signed-off-by: NMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
      54160904
    • M
      dm: publish dm_table_unplug_all · ea0ec640
      Mikulas Patocka 提交于
      Publish dm_table_unplug_all in include/linux/device-mapper.h because this
      function is used by targets.
      Signed-off-by: NMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
      ea0ec640
    • M
      dm: publish dm_get_mapinfo · 89343da0
      Mikulas Patocka 提交于
      Publish dm_get_mapinfo in include/linux/device-mapper.h because this function
      is used by targets.
      Signed-off-by: NMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
      89343da0
    • M
      dm: export struct dm_dev · 82b1519b
      Mikulas Patocka 提交于
      Split struct dm_dev in two and publish the part that other targets need in
      include/linux/device-mapper.h.
      Signed-off-by: NMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
      82b1519b
    • M
      dm crypt: avoid unnecessary wait when splitting bio · 933f01d4
      Milan Broz 提交于
      Don't wait between submitting crypt requests for a bio unless
      we are short of memory.
      
      There are two situations when we must split an encrypted bio:
        1) there are no free pages;
        2) the new bio would violate underlying device restrictions
      (e.g. max hw segments).
      
      In case (2) we do not need to wait.
      
      Add output variable to crypt_alloc_buffer() to distinguish between
      these cases.
      Signed-off-by: NMilan Broz <mbroz@redhat.com>
      Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
      933f01d4
    • M
      dm crypt: tidy ctx pending · c8081618
      Milan Broz 提交于
      Move the initialisation of ctx->pending into one place, at the
      start of crypt_convert().
      
      Introduce crypt_finished to indicate whether or not the encryption
      is finished, for use in a later patch.
      
      No functional change.
      Signed-off-by: NMilan Broz <mbroz@redhat.com>
      Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
      c8081618
    • M
      dm crypt: fix async inc_pending · 4e594098
      Milan Broz 提交于
      The pending reference count must be incremented *before* the async work is
      queued to another thread, not after.  Otherwise there's a race if the
      work completes and decrements the reference count before it gets incremented.
      Signed-off-by: NMilan Broz <mbroz@redhat.com>
      Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
      4e594098