24 Oct, 2008

40 commits

  • Impact: cleanup, small kernel text size reduction, no functionality changed

    reserve_region_with_split() calls in to __reserve_region_with_split(),
    which is an __init function. The only caller of reserve_region_with_split()
    is an __init function, so make it __init too.

    Signed-off-by: Paul Mundt
    Signed-off-by: Ingo Molnar

    Paul Mundt
     
  • both log_buf_copy() and log_buf_len are unused.

    Signed-off-by: Ingo Molnar

    roel kluin
     
  • Move free_module_param_attrs() into the CONFIG_MODULES section, since
    it's only used inside there. Thus avoiding the warning

    kernel/params.c:514: warning: 'free_module_param_attrs' defined but not used

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc: (35 commits)
    proc: remove fs/proc/proc_misc.c
    proc: move /proc/vmcore creation to fs/proc/vmcore.c
    proc: move pagecount stuff to fs/proc/page.c
    proc: move all /proc/kcore stuff to fs/proc/kcore.c
    proc: move /proc/schedstat boilerplate to kernel/sched_stats.h
    proc: move /proc/modules boilerplate to kernel/module.c
    proc: move /proc/diskstats boilerplate to block/genhd.c
    proc: move /proc/zoneinfo boilerplate to mm/vmstat.c
    proc: move /proc/vmstat boilerplate to mm/vmstat.c
    proc: move /proc/pagetypeinfo boilerplate to mm/vmstat.c
    proc: move /proc/buddyinfo boilerplate to mm/vmstat.c
    proc: move /proc/vmallocinfo to mm/vmalloc.c
    proc: move /proc/slabinfo boilerplate to mm/slub.c, mm/slab.c
    proc: move /proc/slab_allocators boilerplate to mm/slab.c
    proc: move /proc/interrupts boilerplate code to fs/proc/interrupts.c
    proc: move /proc/stat to fs/proc/stat.c
    proc: move rest of /proc/partitions code to block/genhd.c
    proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c
    proc: move /proc/devices code to fs/proc/devices.c
    proc: move rest of /proc/locks to fs/locks.c
    ...

    Linus Torvalds
     
  • Signed-off-by: Christoph Hellwig
    [ All users removed in "switch all filesystems over to d_obtain_alias",
    aka commit 440037287c5ebb07033ab927ca16bb68c291d309 ]
    Signed-off-by: Linus Torvalds

    Christoph Hellwig
     
  • This was another merge problem that wasn't a data conflict, but due to
    independent changes in two branches that just didn't work together.

    The pcc-acpi staging driver used

    acpi_driver_data(device) = hotkey;

    to set driver data, but the ACPI merge made that invalid in commit
    db89b4f0dbab837d0f3de2c3e9427a8d5393afa3 ("ACPI: catch calls of
    acpi_driver_data on pointer of wrong type"), and now you're supposed to
    just do.

    device->driver_data = hotkey;

    instead.

    Fix it up.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • This one was due to a merge error: we added a use of nd.path in commit
    2d7c820e56ce83b23daee9eb5343730fb309418e ("ext3: add checks for errors
    from jbd"), and concurrently we got rid of 'nd' and used a naked 'path'
    in commit 8264613def2e5c4f12bc3167713090fd172e6055 ("[PATCH] switch
    quota_on-related stuff to kern_path()").

    That all merged cleanly, but it didn't actually _work_. This should fix
    it.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • …inux/kernel/git/tip/linux-2.6-tip

    * 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits)
    hrtimers: add missing docbook comments to struct hrtimer
    hrtimers: simplify hrtimer_peek_ahead_timers()
    hrtimers: fix docbook comments
    DECLARE_PER_CPU needs linux/percpu.h
    hrtimers: fix typo
    rangetimers: fix the bug reported by Ingo for real
    rangetimer: fix BUG_ON reported by Ingo
    rangetimer: fix x86 build failure for the !HRTIMERS case
    select: fix alpha OSF wrapper
    select: fix alpha OSF wrapper
    hrtimer: peek at the timer queue just before going idle
    hrtimer: make the futex() system call use the per process slack value
    hrtimer: make the nanosleep() syscall use the per process slack
    hrtimer: fix signed/unsigned bug in slack estimator
    hrtimer: show the timer ranges in /proc/timer_list
    hrtimer: incorporate feedback from Peter Zijlstra
    hrtimer: add a hrtimer_start_range() function
    hrtimer: another build fix
    hrtimer: fix build bug found by Ingo
    hrtimer: make select() and poll() use the hrtimer range feature
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
    cifs: handle the TCP_Server_Info->tsk field more carefully
    cifs: fix unlinking of rename target when server doesn't support open file renames
    [CIFS] improve setlease handling
    [CIFS] fix saving of resume key before CIFSFindNext
    cifs: make cifs_rename handle -EACCES errors
    [CIFS] fix build error
    [CIFS] undo changes in cifs_rename_pending_delete if it errors out
    cifs: track DeletePending flag in cifsInodeInfo
    cifs: don't use CREATE_DELETE_ON_CLOSE in cifs_rename_pending_delete
    [CIFS] eliminate usage of kthread_stop for cifsd
    [CIFS] Add nodfs mount option

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ALSA: aoa i2sbus: don't overwrite module parameter
    ALSA: ASoC: tlv320aic3x: Fix DSP DAI format and signal polarities matching
    ALSA: ASoC: OMAP: Continue fixing DSP DAI format in McBSP DAI driver
    ALSA: Ensure PXA runtime data is initialised
    ALSA: hda - correct bracketing in spdif test in patch_sigmatel.c
    ALSA: hda - Fix conflicting volume controls on ALC260

    Linus Torvalds
     
  • Variable 'ret' is no longer used. Don't declare it.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
    avr32: Fix GPIO initcall breakage
    avr32: Scale loops_per_jiffy when cpu frequency changes
    avr32: Fix bug in LCD pin setup on port C
    avr32: Add defconfig for the favr-32 board
    avr32: Add defconfig for the mimc200 board
    avr32: Add MIMC200 board support
    avr32: Fix MIMC200 board use of SPD network pins
    avr32: add support for EarthLCD Favr-32 board
    avr32: Add support for EVKLCD10X addon boards
    avr32: Kconfig: Remove pointless if around atstk1000 include

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev: (66 commits)
    [PATCH] kill the rest of struct file propagation in block ioctls
    [PATCH] get rid of struct file use in blkdev_ioctl() BLKBSZSET
    [PATCH] get rid of blkdev_locked_ioctl()
    [PATCH] get rid of blkdev_driver_ioctl()
    [PATCH] sanitize blkdev_get() and friends
    [PATCH] remember mode of reiserfs journal
    [PATCH] propagate mode through swsusp_close()
    [PATCH] propagate mode through open_bdev_excl/close_bdev_excl
    [PATCH] pass fmode_t to blkdev_put()
    [PATCH] kill the unused bsize on the send side of /dev/loop
    [PATCH] trim file propagation in block/compat_ioctl.c
    [PATCH] end of methods switch: remove the old ones
    [PATCH] switch sr
    [PATCH] switch sd
    [PATCH] switch ide-scsi
    [PATCH] switch tape_block
    [PATCH] switch dcssblk
    [PATCH] switch dasd
    [PATCH] switch mtd_blkdevs
    [PATCH] switch mmc
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (46 commits)
    [PATCH] fs: add a sanity check in d_free
    [PATCH] i_version: remount support
    [patch] vfs: make security_inode_setattr() calling consistent
    [patch 1/3] FS_MBCACHE: don't needlessly make it built-in
    [PATCH] move executable checking into ->permission()
    [PATCH] fs/dcache.c: update comment of d_validate()
    [RFC PATCH] touch_mnt_namespace when the mount flags change
    [PATCH] reiserfs: add missing llseek method
    [PATCH] fix ->llseek for more directories
    [PATCH vfs-2.6 6/6] vfs: add LOOKUP_RENAME_TARGET intent
    [PATCH vfs-2.6 5/6] vfs: remove LOOKUP_PARENT from non LOOKUP_PARENT lookup
    [PATCH vfs-2.6 4/6] vfs: remove unnecessary fsnotify_d_instantiate()
    [PATCH vfs-2.6 3/6] vfs: add __d_instantiate() helper
    [PATCH vfs-2.6 2/6] vfs: add d_ancestor()
    [PATCH vfs-2.6 1/6] vfs: replace parent == dentry->d_parent by IS_ROOT()
    [PATCH] get rid of on-stack dentry in udf
    [PATCH 2/2] anondev: switch to IDA
    [PATCH 1/2] anondev: init IDR statically
    [JFFS2] Use d_splice_alias() not d_add() in jffs2_lookup()
    [PATCH] Optimise NFS readdir hack slightly.
    ...

    Linus Torvalds
     
  • * 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits)
    x86: canonicalize remaining header guards
    x86: drop double underscores from header guards
    x86: Fix ASM_X86__ header guards
    x86, um: get rid of uml-config.h
    x86, um: get rid of arch/um/Kconfig.arch
    x86, um: get rid of arch/um/os symlink
    x86, um: get rid of excessive includes of uml-config.h
    x86, um: get rid of header symlinks
    x86, um: merge Kconfig.i386 and Kconfig.x86_64
    x86, um: get rid of sysdep symlink
    x86, um: trim the junk from uml ptrace-*.h
    x86, um: take vm-flags.h to sysdep
    x86, um: get rid of uml asm/arch
    x86, um: get rid of uml highmem.h
    x86, um: get rid of uml unistd.h
    x86, um: get rid of system.h -> system.h include
    x86, um: uml atomic.h is not needed anymore
    x86, um: untangle uml ldt.h
    x86, um: get rid of more uml asm/arch uses
    x86, um: remove dead header (uml module-generic.h; never used these days)
    ...

    Linus Torvalds
     
  • Takashi Iwai
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (123 commits)
    dock: make dock driver not a module
    ACPI: fix ia64 build warning
    ACPI: hack around sysfs warning with link order
    ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n
    intel_menlo: fix build warning
    panasonic-laptop: fix build
    ACPICA: Update version to 20080926
    ACPICA: Add support for zero-length buffer-to-string conversions
    ACPICA: New: Validation for predefined ACPI methods/objects
    ACPICA: Fix for implicit return compatibility
    ACPICA: Fixed a couple memory leaks associated with "implicit return"
    ACPICA: Optimize buffer allocation procedure
    ACPICA: Fix possible memory leak, error exit path
    ACPICA: Fix fault after mem allocation failure in AML parser
    ACPICA: Remove unused ACPI register bit definition
    ACPICA: Update version to 20080829
    ACPICA: Fix possible memory leak in acpi_ns_get_external_pathname
    ACPICA: Cleanup for internal Reference Object
    ACPICA: Update comments - no functional changes
    ACPICA: Update for Reference ACPI_OPERAND_OBJECT
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
    sh: asm/gpio.h needs linux/kernel.h for might_sleep()/WARN_ON().
    sh: mach-highlander: Handle SCIF pinmuxing on R7785RP.
    sh: sh7785 pinmux support
    sh: update defconfigs.
    sh: Kill off unused p1fc divisors from SH7763 clk fwk.
    sh: improve pinmux support for single direction pins
    sh: use 10MHz VIO_CLK for ov772x on Migo-R
    sh: Update gpio_set_value() pin value handling
    sh: update ov772x byte order on Migo-R
    rtc: Add R2025S/D comment to rs5c372 Kconfig entry.
    sh: Export cache flush routines needed by sh_eth on SH7619.
    sh: Wire up oops reporting in the die notifier chain.
    sh: ap325rxa: Kill off unused port definitions.
    sh: Hook up PB0->PB7 input-only pins in SH7203 PFC.
    sh: ap325rxa: Move off of hardcoded pinmux for flctl initialization.
    sh: add support FLCTL for ap325rxa board
    sh: gpio: Stub in dummy GPIOIRQ mapping routines.
    sh: rsk7203: leds-gpio support for RSK+ LEDs.
    sh: gpio: Include asm-generic/gpio.h for non-gpiolib stubs.
    sh: fix soc-camera compile breakage on Migo-R.
    ...

    Linus Torvalds
     
  • * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
    drm: Avoid oops in DRM_IOCTL_RM_DRAW if a bad handle is supplied.
    drm: Add 32-bit compatibility for DRM_IOCTL_UPDATE_DRAW.
    drm/i915: use pipes, not planes to label vblank data
    drm/i915: hold dev->struct_mutex and DRM lock during vblank ring operations
    i915: Fix format string warnings on x86-64.
    i915: Don't dereference HWS in /proc debug files when it isn't initialized.
    i915: Enable IMR passthrough of vblank events before enabling it in pipestat.
    drm: Remove two leaks of vblank reference count in error paths.
    drm: fix leak of cliprects in drm_rmdraw()
    i915: Disable MSI on GM965 (errata says it doesn't work)
    drm: Set cliprects to NULL when changing drawable to having 0 cliprects.
    i915: Protect vblank IRQ reg access with spinlock

    Linus Torvalds
     
  • * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (32 commits)
    PCI hotplug: fix logic in Compaq hotplug controller bus speed setup
    PCI: don't export linux/io.h from pci.h
    PCI: PCI_QUIRKS depends on PCI
    PCI hotplug: pciehp: poll data link layer link active
    PCI hotplug: pciehp: fix possible memory leak in pcie_init
    PCI: Workaround invalid P2P bridge bus numbers
    PCI Hotplug: fakephp: add duplicate slot name debugging
    PCI: Hotplug core: remove 'name'
    PCI: shcphp: remove 'name' parameter
    PCI: SGI Hotplug: stop managing bss_hotplug_slot->name
    PCI: rpaphp: kmalloc/kfree slot->name directly
    PCI: pciehp: remove 'name' parameter
    PCI: ibmphp: stop managing hotplug_slot->name
    PCI: fakephp: remove 'name' parameter
    PCI, PCI Hotplug: introduce slot_name helpers
    PCI: cpqphp: stop managing hotplug_slot->name
    PCI: cpci_hotplug: stop managing hotplug_slot->name
    PCI: acpiphp: remove 'name' parameter
    PCI: prevent duplicate slot names
    PCI Hotplug: serialize pci_hp_register and pci_hp_deregister
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
    9p: fix sparse warnings
    9p: rdma: RDMA Transport Support for 9P
    9p: fix format warning
    9p: fix debug build error

    Linus Torvalds
     
  • * 'for-2.6.28' of git://linux-nfs.org/~bfields/linux:
    nfsd: clean up expkey_parse error cases
    nfsd: Drop reference in expkey_parse error cases
    nfsd: Fix memory leak in nfsd_getxattr
    NFSD: Fix BUG during NFSD shutdown processing

    Linus Torvalds
     
  • * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
    i2c: Add info->archdata field
    i2c: Inform about deprecated chips directory
    i2c: Use pci_ioremap_bar()
    Schedule removal of the legacy i2c device driver binding model
    i2c: Clean up
    i2c: Update and clean up writing-clients document
    i2c: Drop 2-byte address block transfer defines
    i2c: Delete legacy model documentation
    i2c: Constify i2c_get_clientdata's parameter
    i2c: Delete outdated client porting guide
    i2c: Make clear what the class field of i2c_adapter is good for
    i2c-algo-pcf: Fix typo in debugging log message
    i2c-algo-pcf: Add adapter hooks around xfer begin and end
    i2c-algo-pcf: Pass adapter data into ->waitforpin() method
    i2c-i801: Add support for Intel Ibex Peak

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
    USB: don't rebind drivers after failed resume or reset
    USB: fix memory leak in cdc-acm
    USB: Unusual dev for Mio moov 330 gps
    USB: cdc-wdm: make module autoload work
    USB: Fix unneeded endpoint check in pxa27x_udc
    usb/gadget: fix kernel-doc warning
    USB: Speedtouch: add pre_reset and post_reset routines
    USB: usbtest.c: length, sglen and vary are unsigned, so cannot be negative
    USB: support Huawei data card product IDs
    USB: add ZTE MF626 USB GSM modem entry
    USB: storage: Avoid I/O errors when issuing SCSI ioctls to JMicron USB/ATA bridge
    USB: Fix debugfs_create_file's error checking method for usb/gadget/s3c2410_udc
    USB: ohci: add support for tmio-ohci cell

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (42 commits)
    Staging: usbip: fix build warning on 64bit kernels
    Staging: me4000: remove some compiler warnings
    Staging: wbusb: fix a bunch of compiler warnings
    Staging: w35und: module init cleanup
    Staging: w35und: use gotos for error handling
    Staging: w35und: remove spinlock wrappers
    Staging: sxg: fix compiler warnings.
    Staging: sxg: fix up unused function warnings
    Staging: sxg: clean up C99 comments
    Staging: Lindent the echo driver
    Staging: SLICOSS: Free multicast list at driver exit
    Staging: PCC-ACPI: Fix all checkpatch errors
    Staging: pcc-acpi: update to latest version
    Staging: Clean up sxg driver
    Staging: remove remaining uses of __FUNCTION__
    Staging: add poch driver
    Staging: wlan-ng: fix build error if wireless networking is not enabled
    Staging: echo: remove annoying "end of function" markers
    Staging: echo: remove __cplusplus macro magic
    Staging: echo: remove dead code
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile: (21 commits)
    OProfile: Fix buffer synchronization for IBS
    oprofile: hotplug cpu fix
    oprofile: fixing whitespaces in arch/x86/oprofile/*
    oprofile: fixing whitespaces in arch/x86/oprofile/*
    oprofile: fixing whitespaces in drivers/oprofile/*
    x86/oprofile: add the logic for enabling additional IBS bits
    x86/oprofile: reordering functions in nmi_int.c
    x86/oprofile: removing unused function parameter in add_ibs_begin()
    oprofile: more whitespace fixes
    oprofile: whitespace fixes
    OProfile: Rename IBS sysfs dir into "ibs_op"
    OProfile: Rework string handling in setup_ibs_files()
    OProfile: Rework oprofile_add_ibs_sample() function
    oprofile: discover counters for op ppro too
    oprofile: Implement Intel architectural perfmon support
    oprofile: Don't report Nehalem as core_2
    oprofile: drop const in num counters field
    Revert "Oprofile Multiplexing Patch"
    x86, oprofile: BUG: using smp_processor_id() in preemptible code
    x86/oprofile: fix on_each_cpu build error
    ...

    Manually fixed trivial conflicts in
    drivers/oprofile/{cpu_buffer.c,event_buffer.h}

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
    stop_machine: fix error code handling on multiple cpus
    stop_machine: use workqueues instead of kernel threads
    workqueue: introduce create_rt_workqueue
    Call init_workqueues before pre smp initcalls.
    Make panic= and panic_on_oops into core_params
    Make initcall_debug a core_param
    core_param() for genuinely core kernel parameters
    param: Fix duplicate module prefixes
    module: check kernel param length at compile time, not runtime
    Remove stop_machine during module load v2
    module: simplify load_module.

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (36 commits)
    V4L/DVB (9336): cx88: always de-alloc frontends on fault condition
    V4L/DVB (9335): videobuf: split unregister bus creating self-contained frontend de-allocator
    V4L/DVB (9334): cx88: dvb_remove debug output
    V4L/DVB (9333): cx88: Not all boards that requires cx88-mpeg has frontends
    V4L/DVB (9332): cx88: initial fix for analogue only compilation
    V4L/DVB (9331): Remove unused inode parameter from video_ioctl2
    V4L/DVB (9330): Get rid of inode parameter at v4l_compat_translate_ioctl()
    V4L/DVB (9328): ivtvfb: FB_BLANK_POWERDOWN turns off video output
    V4L/DVB (9327): v4l: use video_device.num instead of minor in video%d
    V4L/DVB (9326): ivtv: avoid green flashing when loading ivtv
    V4L/DVB (9325): ivtv: switch to unlocked_ioctl.
    V4L/DVB (9324): v4l2: add video_ioctl2_unlocked for unlocked_ioctl support.
    V4L/DVB (9323): v4l2-int-if: Add enum_framesizes and enum_frameintervals ioctls.
    V4L/DVB (9322): v4l2-int-if: Export more interfaces to modules
    V4L/DVB (9321): v4l2-int-if: Define new power state changes
    V4L/DVB (9320): v4l2: Add 10-bit RAW Bayer formats
    V4L/DVB (9319): v4l2-int-if: Add cropcap, g_crop and s_crop commands.
    V4L/DVB (9318): v4l2-int-if: Add command to get slave private data.
    V4L/DVB (9316): s5h1411: Power down s5h1411 when not in use
    V4L/DVB (9315): s5h1411: Skip reconfiguring demod modulation if already at the desired modulation
    ...

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    NOHZ: fix thinko in the timer restart code path

    Linus Torvalds
     
  • * git://git.infradead.org/iommu-2.6:
    Admit to maintaining VT-d, for my sins.
    dmar: fix uninitialised 'ret' variable in dmar_parse_dev()
    intel-iommu: use coherent_dma_mask in alloc_coherent
    amd_iommu: fix nasty bug that caused ILLEGAL_DEVICE_TABLE_ENTRY errors
    intel-iommu: IA64 support
    dmar: remove the quirk which disables dma-remapping when intr-remapping enabled
    dmar: Use queued invalidation interface for IOTLB and context invalidation
    dmar: context cache and IOTLB invalidation using queued invalidation
    dmar: use spin_lock_irqsave() in qi_submit_sync()

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
    ide: remove useless subdirs from drivers/ide/

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
    dm: tidy local_init
    dm: remove unused flush_all
    dm raid1: separate region_hash interface part1
    dm: mark split bio as cloned
    dm crypt: remove waitqueue
    dm crypt: fix async split
    dm crypt: tidy sector
    dm: remove dm header from targets
    dm: publish array_too_big
    dm exception store: fix misordered writes
    dm exception store: refactor zero_area
    dm snapshot: drop unused last_percent
    dm snapshot: fix primary_pe race
    dm kcopyd: avoid queue shuffle

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    rcupdate: fix bug of rcu_barrier*()
    profiling: fix !procfs build

    Fixed trivial conflicts in 'include/linux/profile.h'

    Linus Torvalds
     
  • …l/git/tip/linux-2.6-tip

    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    sched: disable the hrtick for now
    sched: revert back to per-rq vruntime
    sched: fair scheduler should not resched rt tasks
    sched: optimize group load balancer
    sched: minor fast-path overhead reduction
    sched: fix the wrong mask_len, cleanup
    sched: kill unused scheduler decl.
    sched: fix the wrong mask_len
    sched: only update rq->clock while holding rq->lock

    Linus Torvalds
     
  • …git/tip/linux-2.6-tip

    * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    genirq: NULL struct irq_desc's member 'name' in dynamic_irq_cleanup()
    genirq: fix off by one and coding style
    genirq: fix set_irq_type() when recording trigger type

    Linus Torvalds
     
  • These have the Mainpine PCI identifier on however

    Additional paranoia check for Tornado versions added by Alan Cox

    (and this time I remembered to do an stg refresh so that the corrections ended
    up in these patches not randomly attached to another diff -- Alan)

    Signed-off-by: Lee Howard
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Lee Howard
     
  • Add support for the OxSemi 'Tornado' devices.

    Reformatted and reworked a bit by Alan Cox

    Signed-off-by: Lee Howard
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Lee Howard
     
  • We shouldn't modify a global variable here.

    Signed-off-by: Johannes Berg
    Signed-off-by: Takashi Iwai

    Johannes Berg
     
  • Pass the brown paper bags please. I changed the semantics of this so the
    function was supposed to do the extra kref itself then forgot to do the
    change.. duh....

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • This seems to have popped up after the recent merges:

    drivers/watchdog/w83697ug_wdt.c: In function ‘w83697ug_select_wd_register’:
    drivers/watchdog/w83697ug_wdt.c:105: warning: ‘return’ with a value, in function returning void

    Signed-off-by: Alan Cox
    Acked-by: Wim Van Sebroeck
    Signed-off-by: Linus Torvalds

    Alan Cox