15 Jul, 2006

8 commits

  • This patch removes the reference to set_wmb from memory-barriers.txt
    since it shouldn't be used.

    Signed-off-by: Steven Rostedt
    Signed-off-by: Linus Torvalds

    Steven Rostedt
     
  • Change documentation and example program to reflect the flow control issues
    being addressed by the cpumask changes.

    Signed-off-by: Shailabh Nagar
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Shailabh Nagar
     
  • Send per-tgid data only once during exit of a thread group instead of once
    with each member thread exit.

    Currently, when a thread exits, besides its per-tid data, the per-tgid data
    of its thread group is also sent out, if its thread group is non-empty.
    The per-tgid data sent consists of the sum of per-tid stats for all
    *remaining* threads of the thread group.

    This patch modifies this sending in two ways:

    - the per-tgid data is sent only when the last thread of a thread group
    exits. This cuts down heavily on the overhead of sending/receiving
    per-tgid data, especially when other exploiters of the taskstats
    interface aren't interested in per-tgid stats

    - the semantics of the per-tgid data sent are changed. Instead of being
    the sum of per-tid data for remaining threads, the value now sent is the
    true total accumalated statistics for all threads that are/were part of
    the thread group.

    The patch also addresses a minor issue where failure of one accounting
    subsystem to fill in the taskstats structure was causing the send of
    taskstats to not be sent at all.

    The patch has been tested for stability and run cerberus for over 4 hours
    on an SMP.

    [akpm@osdl.org: bugfixes]
    Signed-off-by: Shailabh Nagar
    Signed-off-by: Balbir Singh
    Cc: Jay Lan
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Shailabh Nagar
     
  • Some documentation for delay accounting.

    Signed-off-by: Shailabh Nagar
    Signed-off-by: Balbir Singh
    Cc: Jes Sorensen
    Cc: Peter Chubb
    Cc: Erich Focht
    Cc: Levent Serinol
    Cc: Jay Lan
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Shailabh Nagar
     
  • Create a "taskstats" interface based on generic netlink (NETLINK_GENERIC
    family), for getting statistics of tasks and thread groups during their
    lifetime and when they exit. The interface is intended for use by multiple
    accounting packages though it is being created in the context of delay
    accounting.

    This patch creates the interface without populating the fields of the data
    that is sent to the user in response to a command or upon the exit of a task.
    Each accounting package interested in using taskstats has to provide an
    additional patch to add its stats to the common structure.

    [akpm@osdl.org: cleanups, Kconfig fix]
    Signed-off-by: Shailabh Nagar
    Signed-off-by: Balbir Singh
    Cc: Jes Sorensen
    Cc: Peter Chubb
    Cc: Erich Focht
    Cc: Levent Serinol
    Cc: Jay Lan
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Shailabh Nagar
     
  • Initialization code related to collection of per-task "delay" statistics which
    measure how long it had to wait for cpu, sync block io, swapping etc. The
    collection of statistics and the interface are in other patches. This patch
    sets up the data structures and allows the statistics collection to be
    disabled through a kernel boot parameter.

    Signed-off-by: Shailabh Nagar
    Signed-off-by: Balbir Singh
    Cc: Jes Sorensen
    Cc: Peter Chubb
    Cc: Erich Focht
    Cc: Levent Serinol
    Cc: Jay Lan
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Shailabh Nagar
     
  • pci_dac_set_dma_mask() gives only a single match in the whole kernel tree
    and that's in this doc file. The best candidate for replacement is
    pci_dac_dma_supported().

    Signed-off-by: Rolf Eike Beer
    Cc: Greg KH
    Acked-by: "David S. Miller"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Rolf Eike Beer
     
  • The default ramdisk blocksize is actually 1024, not 512 bytes. Also fixes
    up some trailing whitespace issues.

    Signed-off-by: Nathan Scott
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Nathan Scott
     

14 Jul, 2006

1 commit


13 Jul, 2006

8 commits

  • * HEAD:
    [PATCH] hwmon: Documentation update for abituguru
    [PATCH] hwmon: Fix for first generation Abit uGuru chips
    [PATCH] hwmon: New maintainer for w83791d
    [PATCH] pca9539: Honor the force parameter
    [PATCH] i2c-algo-bit: Wipe out dead code
    [PATCH] i2c: Handle i2c_add_adapter failure in i2c algorithm drivers
    [PATCH] i2c: New mailing list
    [PATCH] i2c-ite: Plan for removal
    [PATCH] i2c-powermac: Fix master_xfer return value
    [PATCH] scx200_acb: Fix the block transactions
    [PATCH] scx200_acb: Fix the state machine
    [PATCH] i2c-iop3xx: Avoid addressing self
    [PATCH] i2c: Fix 'ignore' module parameter handling in i2c-core

    Linus Torvalds
     
  • * HEAD:
    [PATCH] The scheduled unexport of insert_resource
    [PATCH] remove kernel/power/pm.c:pm_unregister_all()
    [PATCH] Driver core: bus.c cleanups
    [PATCH] Driver core: kernel-doc in drivers/base/core.c corrections
    [PATCH] Driver core: fix driver-core kernel-doc

    Linus Torvalds
     
  • Implement the scheduled unexport of insert_resource.

    Signed-off-by: Adrian Bunk
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    Adrian Bunk
     
  • Text from the back of the box, for your information/amusement:

    USB DATA CABLE
    FOR K700 Series

    The USB Cable is an ideal link between your mobile phone and PC. Employing
    the user-friendiy [sic] USB standard,its capacity for rapid data transfer enables functions
    such as synchronization of phone book and calendar,as well as Internet browsing via
    a modem-enabled phone.Autual [sic] connection speed is dependent on phone capacity.

    MADE IN CHINA

    From: Peter Moulder
    Signed-off-by: Greg Kroah-Hartman

    Peter Moulder
     
  • Documentation update for the new bank1_types module param.

    Also add what we know about different revisions of the uGuru and
    a note that the abituguru driver unfortunatly does not work with the
    latest and greatest motherboards, which have what I think is revision
    4 of the uGuru.

    Signed-off-by: Hans de Goede
    Signed-off-by: Jean Delvare
    Signed-off-by: Greg Kroah-Hartman

    Hans de Goede
     
  • We have a new mailing list dedicated to linux i2c:
    http://lists.lm-sensors.org/mailman/listinfo/i2c

    Signed-off-by: Jean Delvare
    Signed-off-by: Greg Kroah-Hartman

    Jean Delvare
     
  • Plan the i2c-ite and i2c-algo-ite drivers for removal.
    These drivers never compiled since they were added to the kernel
    tree 5 years ago. Also see:
    http://marc.theaimsgroup.com/?l=linux-mips&m=115040510817448

    Signed-off-by: Jean Delvare
    Signed-off-by: Greg Kroah-Hartman

    Jean Delvare
     
  • Fixed 'section mismatch' errors in ALSA PCI drivers:
    - removed invalid __devinitdata from pci id tables
    - fix/remove __devinit of functions called in suspend/resume

    Signed-off-by: Takashi Iwai
    Signed-off-by: Jaroslav Kysela

    Takashi Iwai
     

11 Jul, 2006

6 commits

  • Update Documentation/SubmitChecklist.

    - Mention lockdep coverage

    - Describe documentation requirements

    - Number the various items to simplify the composition of caustic emails.

    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • As announced half a year ago this patch will remove the tasklist_lock
    export. The previous two patches got rid of the remaining modular users.

    Signed-off-by: Christoph Hellwig
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christoph Hellwig
     
  • When EDAC was first introduced into the kernel it had a sysfs interface,
    but due to some problems it was disabled in 2.6.16 and remained disabled in
    2.6.17.

    With feedback, several of the control and attribute files of that interface
    had some good constructive feedback. PCI Blacklist/Whitelist was a major
    set which has design issues and it has been removed in this patch. Instead
    of storing PCI broken parity status in EDAC, it has been moved to the
    pci_dev structure itself by a previous PCI patch. A future patch will
    enable that feature in EDAC by utilizing the pci_dev info.

    The sysfs is now enabled in this patch, with a minimal set of control and
    attribute files for examining EDAC state and for enabling/disabling the
    memory and PCI operations.

    The Documentation for EDAC has also been updated to reflect the new state
    of EDAC operation.

    Signed-off-by:Doug Thompson
    Cc: Greg KH
    Cc: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Doug Thompson
     
  • As I was looking over the get_sb() changes, I stumbled across a little
    mistake in the documentation updates. Unless we're getting into an
    interesting new object-oriented realm, I doubt that get_sb() should really
    return "struct int"...

    Signed-off-by: Jonathan Corbet
    Acked-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jonathan Corbet
     
  • Updater should use _rcu variant of list_del().

    Signed-off-by: Urs Thuermann
    Acked-by: "Paul E. McKenney"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Urs Thuermann
     
  • * Document the ip command a little differently to make the
    interaction between defaults and autoconfiguration a little clearer
    (I hope)

    * Update autoconfiguration the current set of options, including DHCP

    * Update the boot methods to add syslinux and isolinux, and remove
    dd of=/dev/fd0 which is no longer supported by linux

    * Add a referance to initramfs along side initrd.
    Should the latter and its document be removed some time soon?

    * Various cleanups to put the text consistently into the thrid person

    * Reformated a bit to fit into 80 columns a bit more nicely

    * Should the bootloaders documentation be removed or split
    into a separate documentation, it seems somewhat out of scope

    Signed-off-by: Horms
    Cc: "H. Peter Anvin"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Horms
     

04 Jul, 2006

10 commits

  • * git://git.infradead.org/mtd-2.6:
    [JFFS2][XATTR] Fix memory leak in POSIX-ACL support
    fs/jffs2/: make 2 functions static
    [MTD] NAND: Fix broken sharpsl driver
    [JFFS2][XATTR] Fix xd->refcnt race condition
    MTD: kernel-doc fixes + additions
    MTD: fix all kernel-doc warnings
    [MTD] DOC: Fixup read functions and do a little cleanup

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
    [Bluetooth] Add RFCOMM role switch support
    [Bluetooth] Allow disabling of credit based flow control
    [Bluetooth] Small cleanup of the L2CAP source code
    [Bluetooth] Use real devices for host controllers
    [Bluetooth] Add platform device for virtual and serial devices
    [Bluetooth] Add automatic sniff mode support
    [Bluetooth] Correct SCO buffer size on request
    [Bluetooth] Add suspend/resume support to the HCI USB driver
    [Bluetooth] Use raw mode for the Frontline sniffer device
    [BRIDGE]: br_dump_ifinfo index fix
    [ATM]: add+use poison defines
    [NET]: add+use poison defines
    [IOAT]: fix kernel-doc in source files
    [IOAT]: fix header file kernel-doc
    [TG3]: Add ipv6 TSO feature
    [IPV6]: Fix ipv6 GSO payload length
    [TIPC] Fixed sk_buff panic caused by tipc_link_bundle_buf (REVISED)
    [NET]: Verify gso_type too in gso_segment
    [IPVS]: Add sysctl documentation
    [ROSE]: Try all routes when establishing a ROSE connections.
    ...

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (57 commits)
    [SCSI] fix error handling in scsi_io_completion
    [SCSI] qla1280: fix section mismatch warnings
    [SCSI] mptsas: eliminate ghost devices
    [SCSI] qla2xxx: make some more functions static
    [SCSI] small whitespace cleanup for qlogic driver
    [SCSI] mptbase: mpt_interrupt should return IRQ_NONE
    [SCSI] mptsas: make two functions static
    [SCSI] sg.c: Fix bad error handling in
    [SCSI] 53c700: fix breakage caused by the autosense update
    [SCSI] iscsi: add async notification of session events
    [SCSI] iscsi: pass target nr to session creation
    [SCSI] iscsi: break up session creation into two stages
    [SCSI] iscsi: rm channel usage from iscsi
    [SCSI] iscsi: fix session refcouting
    [SCSI] iscsi: convert iscsi_tcp to new set/get param fns
    [SCSI] iscsi: convert iser to new set/get param fns
    [SCSI] iscsi: fixup set/get param functions
    [SCSI] iscsi: add target discvery event to transport class
    [SCSI] st: remove unused st_buffer.in_use
    [SCSI] atp870u: reduce huge stack usage
    ...

    Linus Torvalds
     
  • * Derived from http://www.linuxvirtualserver.org/docs/sysctl.html, v1.4
    maintained by Wensong Zhang

    * Adjusted preample to match ip-sysctl.txt

    * Sorted options into alphabetical order

    * Added expire_quiescent_template

    * Removed timeout_* which are no longer present

    * Incoporated doc/debug-levels.txt from IPVS source tree into
    description of ipvs_debug

    * Minor spelling fixes

    * Further editing more than welcome

    Signed-Off-By: Horms
    Signed-off-by: David S. Miller

    Horms
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
    powerpc: add defconfig for Freescale MPC8349E-mITX board
    powerpc: Add base support for the Freescale MPC8349E-mITX eval board
    Documentation: correct values in MPC8548E SEC example node
    [POWERPC] Actually copy over i8259.c to arch/ppc/syslib this time
    [POWERPC] Add new interrupt mapping core and change platforms to use it
    [POWERPC] Copy i8259 code back to arch/ppc
    [POWERPC] New device-tree interrupt parsing code
    [POWERPC] Use the genirq framework
    [PATCH] genirq: Allow fasteoi handler to retrigger disabled interrupts
    [POWERPC] Update the SWIM3 (powermac) floppy driver
    [POWERPC] Fix error handling in detecting legacy serial ports
    [POWERPC] Fix booting on Momentum "Apache" board (a Maple derivative)
    [POWERPC] Fix various offb and BootX-related issues
    [POWERPC] Add a default config for 32-bit CHRP machines
    [POWERPC] fix implicit declaration on cell.
    [POWERPC] change get_property to return void *

    Linus Torvalds
     
  • Lock validator design documentation.

    Signed-off-by: Ingo Molnar
    Signed-off-by: Arjan van de Ven
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ingo Molnar
     
  • Introduce DEBUG_LOCKING_API_SELFTESTS, which uses the generic lock debugging
    code's silent-failure feature to run a matrix of testcases. There are 210
    testcases currently:

    +-----------------------
    | Locking API testsuite:
    +------------------------------+------+------+------+------+------+------+
    | spin |wlock |rlock |mutex | wsem | rsem |
    -------------------------------+------+------+------+------+------+------+
    A-A deadlock: ok | ok | ok | ok | ok | ok |
    A-B-B-A deadlock: ok | ok | ok | ok | ok | ok |
    A-B-B-C-C-A deadlock: ok | ok | ok | ok | ok | ok |
    A-B-C-A-B-C deadlock: ok | ok | ok | ok | ok | ok |
    A-B-B-C-C-D-D-A deadlock: ok | ok | ok | ok | ok | ok |
    A-B-C-D-B-D-D-A deadlock: ok | ok | ok | ok | ok | ok |
    A-B-C-D-B-C-D-A deadlock: ok | ok | ok | ok | ok | ok |
    double unlock: ok | ok | ok | ok | ok | ok |
    bad unlock order: ok | ok | ok | ok | ok | ok |
    --------------------------------------+------+------+------+------+------+
    recursive read-lock: | ok | | ok |
    --------------------------------------+------+------+------+------+------+
    non-nested unlock: ok | ok | ok | ok |
    --------------------------------------+------+------+------+
    hard-irqs-on + irq-safe-A/12: ok | ok | ok |
    soft-irqs-on + irq-safe-A/12: ok | ok | ok |
    hard-irqs-on + irq-safe-A/21: ok | ok | ok |
    soft-irqs-on + irq-safe-A/21: ok | ok | ok |
    sirq-safe-A => hirqs-on/12: ok | ok | ok |
    sirq-safe-A => hirqs-on/21: ok | ok | ok |
    hard-safe-A + irqs-on/12: ok | ok | ok |
    soft-safe-A + irqs-on/12: ok | ok | ok |
    hard-safe-A + irqs-on/21: ok | ok | ok |
    soft-safe-A + irqs-on/21: ok | ok | ok |
    hard-safe-A + unsafe-B #1/123: ok | ok | ok |
    soft-safe-A + unsafe-B #1/123: ok | ok | ok |
    hard-safe-A + unsafe-B #1/132: ok | ok | ok |
    soft-safe-A + unsafe-B #1/132: ok | ok | ok |
    hard-safe-A + unsafe-B #1/213: ok | ok | ok |
    soft-safe-A + unsafe-B #1/213: ok | ok | ok |
    hard-safe-A + unsafe-B #1/231: ok | ok | ok |
    soft-safe-A + unsafe-B #1/231: ok | ok | ok |
    hard-safe-A + unsafe-B #1/312: ok | ok | ok |
    soft-safe-A + unsafe-B #1/312: ok | ok | ok |
    hard-safe-A + unsafe-B #1/321: ok | ok | ok |
    soft-safe-A + unsafe-B #1/321: ok | ok | ok |
    hard-safe-A + unsafe-B #2/123: ok | ok | ok |
    soft-safe-A + unsafe-B #2/123: ok | ok | ok |
    hard-safe-A + unsafe-B #2/132: ok | ok | ok |
    soft-safe-A + unsafe-B #2/132: ok | ok | ok |
    hard-safe-A + unsafe-B #2/213: ok | ok | ok |
    soft-safe-A + unsafe-B #2/213: ok | ok | ok |
    hard-safe-A + unsafe-B #2/231: ok | ok | ok |
    soft-safe-A + unsafe-B #2/231: ok | ok | ok |
    hard-safe-A + unsafe-B #2/312: ok | ok | ok |
    soft-safe-A + unsafe-B #2/312: ok | ok | ok |
    hard-safe-A + unsafe-B #2/321: ok | ok | ok |
    soft-safe-A + unsafe-B #2/321: ok | ok | ok |
    hard-irq lock-inversion/123: ok | ok | ok |
    soft-irq lock-inversion/123: ok | ok | ok |
    hard-irq lock-inversion/132: ok | ok | ok |
    soft-irq lock-inversion/132: ok | ok | ok |
    hard-irq lock-inversion/213: ok | ok | ok |
    soft-irq lock-inversion/213: ok | ok | ok |
    hard-irq lock-inversion/231: ok | ok | ok |
    soft-irq lock-inversion/231: ok | ok | ok |
    hard-irq lock-inversion/312: ok | ok | ok |
    soft-irq lock-inversion/312: ok | ok | ok |
    hard-irq lock-inversion/321: ok | ok | ok |
    soft-irq lock-inversion/321: ok | ok | ok |
    hard-irq read-recursion/123: ok |
    soft-irq read-recursion/123: ok |
    hard-irq read-recursion/132: ok |
    soft-irq read-recursion/132: ok |
    hard-irq read-recursion/213: ok |
    soft-irq read-recursion/213: ok |
    hard-irq read-recursion/231: ok |
    soft-irq read-recursion/231: ok |
    hard-irq read-recursion/312: ok |
    soft-irq read-recursion/312: ok |
    hard-irq read-recursion/321: ok |
    soft-irq read-recursion/321: ok |
    --------------------------------+-----+----------------
    Good, all 210 testcases passed! |
    --------------------------------+

    Signed-off-by: Ingo Molnar
    Signed-off-by: Arjan van de Ven
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ingo Molnar
     
  • Add Documentation/irqflags-tracing.txt.

    Signed-off-by: Ingo Molnar
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ingo Molnar
     
  • It turns out that it is advantageous to leave a small portion of unmapped file
    backed pages if all of a zone's pages (or almost all pages) are allocated and
    so the page allocator has to go off-node.

    This allows recently used file I/O buffers to stay on the node and
    reduces the times that zone reclaim is invoked if file I/O occurs
    when we run out of memory in a zone.

    The problem is that zone reclaim runs too frequently when the page cache is
    used for file I/O (read write and therefore unmapped pages!) alone and we have
    almost all pages of the zone allocated. Zone reclaim may remove 32 unmapped
    pages. File I/O will use these pages for the next read/write requests and the
    unmapped pages increase. After the zone has filled up again zone reclaim will
    remove it again after only 32 pages. This cycle is too inefficient and there
    are potentially too many zone reclaim cycles.

    With the 1% boundary we may still remove all unmapped pages for file I/O in
    zone reclaim pass. However. it will take a large number of read and writes
    to get back to 1% again where we trigger zone reclaim again.

    The zone reclaim 2.6.16/17 does not show this behavior because we have a 30
    second timeout.

    [akpm@osdl.org: rename the /proc file and the variable]
    Signed-off-by: Christoph Lameter
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christoph Lameter
     
  • Signed-off-by: Kim Phillips
    Signed-off-by: Kumar Gala

    Kim Phillips
     

03 Jul, 2006

3 commits

  • Conflicts:

    drivers/scsi/nsp32.c
    drivers/scsi/pcmcia/nsp_cs.c

    Removal of randomness flag conflicts with SA_ -> IRQF_ global
    replacement.

    Signed-off-by: James Bottomley

    James Bottomley
     
  • Signed-off-by: Thomas Gleixner
    Cc: Ingo Molnar
    Cc: "David S. Miller"
    Cc: Benjamin Herrenschmidt
    Cc: "Randy.Dunlap"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Thomas Gleixner
     
  • The recent interrupt rework introduced bit value conflicts with sparc.
    Instead of introducing new architecture flags mess, move the interrupt SA_
    flags out of the signal namespace and replace them by interrupt related flags.

    This allows to remove the obsolete SA_INTERRUPT flag and clean up the bit
    field values.

    This patch:

    Move the interrupt related SA_ flags out of linux/signal.h and rename them to
    IRQF_ . This moves the interrupt related flags out of the signal namespace
    and allows to remove the architecture dependencies.

    SA_INTERRUPT is not needed by userspace and glibc so it can be removed safely.

    The existing SA_ constants are kept for easy transition and will be
    removed after a 6 month grace period.

    Signed-off-by: Thomas Gleixner
    Cc: Ingo Molnar
    Cc: "David S. Miller"
    Cc: Benjamin Herrenschmidt
    Cc: "Randy.Dunlap"
    Cc: Jaroslav Kysela
    Cc: Takashi Iwai
    Cc: "Antonino A. Daplas"
    Cc: Greg KH
    Cc: Russell King
    Cc: James Bottomley
    Cc: Kyle McMartin
    Cc: Jeff Garzik
    Cc: Mauro Carvalho Chehab
    Cc: Karsten Keil
    Cc: Jody McIntyre
    Cc: Ben Collins
    Cc: Stefan Richter
    Cc: Alan Cox
    Cc: Bartlomiej Zolnierkiewicz
    Cc: Dave Airlie
    Cc: Jens Axboe
    Cc: Chris Zankel
    Cc: Andi Kleen
    Cc: Miles Bader
    Cc: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Cc: Paul Mundt
    Cc: Kazumoto Kojima
    Cc: Martin Schwidefsky Cc: Heiko Carstens
    Cc: Ralf Baechle
    Cc: Roman Zippel
    Cc: Geert Uytterhoeven
    Cc: Greg Ungerer
    Cc: "Luck, Tony"
    Cc: Yoshinori Sato
    Cc: David Howells
    Cc: Mikael Starvik
    Cc: Russell King
    Cc: Ivan Kokshaysky
    Cc: Richard Henderson
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Thomas Gleixner
     

01 Jul, 2006

4 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
    Remove obsolete #include
    remove obsolete swsusp_encrypt
    arch/arm26/Kconfig typos
    Documentation/IPMI typos
    Kconfig: Typos in net/sched/Kconfig
    v9fs: do not include linux/version.h
    Documentation/DocBook/mtdnand.tmpl: typo fixes
    typo fixes: specfic -> specific
    typo fixes in Documentation/networking/pktgen.txt
    typo fixes: occuring -> occurring
    typo fixes: infomation -> information
    typo fixes: disadvantadge -> disadvantage
    typo fixes: aquire -> acquire
    typo fixes: mecanism -> mechanism
    typo fixes: bandwith -> bandwidth
    fix a typo in the RTC_CLASS help text
    smb is no longer maintained

    Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/:
    [PATCH] pcmcia: fix deadlock in pcmcia_parse_events
    [PATCH] com20020_cs: more device support
    [PATCH] au1xxx: pcmcia: fix __init called from non-init
    [PATCH] kill open-coded offsetof in cm4000_cs.c ZERO_DEV()
    [PATCH] pcmcia: convert pcmcia_cs to kthread
    [PATCH] pcmcia: fix kernel-doc function name
    [PATCH] pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs
    [PATCH] pcmcia: at91_cf suspend/resume/wakeup
    [PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO space is not available
    [PATCH] pcmcia: TI PCIxx12 CardBus controller support
    [PATCH] pcmcia: warn if driver requests exclusive, but gets a shared IRQ
    [PATCH] pcmcia: expose tool in pcmcia/Documentation/pcmcia/
    [PATCH] pcmcia: another ID for serial_cs.c
    [PATCH] yenta: fix hidden PCI bus numbers
    [PATCH] yenta: do power-up only after socket is configured

    Linus Torvalds
     
  • Expose example and tool source files in the Documentation/ directory in
    their own files instead of being buried (almost hidden) in readme/txt files.

    This will make them more visible/usable to users who may need
    to use them, to developers who may need to test with them, and
    to janitors who would update them if they were more visible.

    Also, if any of these possibly should not be in the kernel tree at
    all, it will be clearer that they are here and we can discuss if
    they should be removed.

    Signed-off-by: Randy Dunlap
    Signed-off-by: Dominik Brodowski

    Randy Dunlap
     
  • This patch adds support for the Geniatech Digistar, aka
    Digiwave 103g DVB-S card.
    Acked-by: Andrew de Quincey

    Signed-off-by: Saqeb Akhter
    Signed-off-by: Michael Krufky
    Signed-off-by: Mauro Carvalho Chehab

    Saqeb Akhter