26 Mar, 2011

14 commits

  • * 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
    Introduce ARCH_NO_SYSDEV_OPS config option (v2)
    cpufreq: Use syscore_ops for boot CPU suspend/resume (v2)
    KVM: Use syscore_ops instead of sysdev class and sysdev
    PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev
    timekeeping: Use syscore_ops instead of sysdev class and sysdev
    x86: Use syscore_ops instead of sysdev classes and sysdevs

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (55 commits)
    [SCSI] tcm_loop: Add multi-fabric Linux/SCSI LLD fabric module
    [SCSI] qla4xxx: Use polling mode for disable interrupt mailbox completion
    [SCSI] Revert "[SCSI] Retrieve the Caching mode page"
    [SCSI] bnx2fc: IO completion not processed due to missed wakeup
    [SCSI] qla4xxx: Update driver version to 5.02.00-k6
    [SCSI] qla4xxx: masking required bits of add_fw_options during initialization
    [SCSI] qla4xxx: added new function qla4xxx_relogin_all_devices
    [SCSI] qla4xxx: add support for ql4xsess_recovery_tmo cmd line param
    [SCSI] qla4xxx: Add support for ql4xmaxqdepth command line parameter
    [SCSI] qla4xxx: cleanup function qla4xxx_process_ddb_changed
    [SCSI] qla4xxx: Prevent other port reinitialization during remove_adapter
    [SCSI] qla4xxx: remove unused ddb flag DF_NO_RELOGIN
    [SCSI] qla4xxx: cleanup DDB relogin logic during initialization
    [SCSI] qla4xxx: Do not retry ISP82XX initialization if H/W state is failed
    [SCSI] qla4xxx: Do not send mbox command if FW is in failed state
    [SCSI] qla4xxx: cleanup qla4xxx_initialize_ddb_list()
    [SCSI] ses: add subenclosure support
    [SCSI] bnx2fc: Bump version to 1.0.1
    [SCSI] bnx2fc: Remove unnecessary module state checks
    [SCSI] bnx2fc: Fix MTU issue by using static MTU
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)
    route: Take the right src and dst addresses in ip_route_newports
    ipv4: Fix nexthop caching wrt. scoping.
    ipv4: Invalidate nexthop cache nh_saddr more correctly.
    net: fix pch_gbe section mismatch warning
    ipv4: fix fib metrics
    mlx4_en: Removing HW info from ethtool -i report.
    net_sched: fix THROTTLED/RUNNING race
    drivers/net/a2065.c: Convert release_resource to release_region/release_mem_region
    drivers/net/ariadne.c: Convert release_resource to release_region/release_mem_region
    bonding: fix rx_handler locking
    myri10ge: fix rmmod crash
    mlx4_en: updated driver version to 1.5.4.1
    mlx4_en: Using blue flame support
    mlx4_core: reserve UARs for userspace consumers
    mlx4_core: maintain available field in bitmap allocator
    mlx4: Add blue flame support for kernel consumers
    mlx4_en: Enabling new steering
    mlx4: Add support for promiscuous mode in the new steering model.
    mlx4: generalization of multicast steering.
    mlx4_en: Reporting HW revision in ethtool -i
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
    PCI: Disable ASPM when _OSC control is not granted for PCIe services
    PCI: Changing ASPM policy, via /sys, to POWERSAVE could cause NMIs
    PCI: PCIe links may not get configured for ASPM under POWERSAVE mode
    PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

    Linus Torvalds
     
  • * git://git.infradead.org/battery-2.6: (30 commits)
    bq20z75: Fix time and temp units
    bq20z75: Fix issues with present and suspend
    z2_battery: Fix count of properties
    s3c_adc_battery: Fix method names when PM not set
    z2_battery: Add MODULE_DEVICE_TABLE
    ds2782_battery: Add MODULE_DEVICE_TABLE
    bq20z75: Add MODULE_DEVICE_TABLE
    power_supply: Update power_supply_is_watt_property
    bq20z75: Add i2c retry mechanism
    bq20z75: Add optional battery detect gpio
    twl4030_charger: Make the driver atomic notifier safe
    bq27x00: Use single i2c_transfer call for property read
    bq27x00: Cleanup bq27x00_i2c_read
    bq27x00: Minor cleanups
    bq27x00: Give more specific reports on battery status
    bq27x00: Add MODULE_DEVICE_TABLE
    bq27x00: Add new properties
    bq27x00: Poll battery state
    bq27x00: Cache battery registers
    bq27x00: Add bq27000 support
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
    dm stripe: implement merge method
    dm mpath: allow table load with no priority groups
    dm mpath: fail message ioctl if specified path is not valid
    dm ioctl: add flag to wipe buffers for secure data
    dm ioctl: prepare for crypt key wiping
    dm crypt: wipe keys string immediately after key is set
    dm: add flakey target
    dm: fix opening log and cow devices for read only tables

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

    * 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (23 commits)
    genirq: Expand generic show_interrupts()
    gpio: Fold irq_set_chip/irq_set_handler to irq_set_chip_and_handler
    gpio: Cleanup genirq namespace
    arm: ep93xx: Add basic interrupt info
    arm/gpio: Remove three copies of broken and racy debug code
    xtensa: Use generic show_interrupts()
    xtensa: Convert genirq namespace
    xtensa: Use generic IRQ Kconfig and set GENERIC_HARDIRQS_NO_DEPRECATED
    xtensa: Convert s6000 gpio irq_chip to new functions
    xtensa: Convert main irq_chip to new functions
    um: Use generic show_interrupts()
    um: Convert genirq namespace
    m32r: Use generic show_interrupts()
    m32r: Convert genirq namespace
    h8300: Use generic show_interrupts()
    h8300: Convert genirq namespace
    avr32: Cleanup eic_set_irq_type()
    avr32: Use generic show_interrupts()
    avr: Cleanup genirq namespace
    avr32: Use generic IRQ config, enable GENERIC_HARDIRQS_NO_DEPRECATED
    ...

    Fix up trivial conflict in drivers/gpio/timbgpio.c

    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, doc: Update sched-design-CFS.txt
    sched: Remove unused 'rq' variable and cpu_rq() call from alloc_fair_sched_group()
    sched.h: Fix a typo ("its")
    sched: Fix yield_to kernel-doc

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

    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    perf, x86: Complain louder about BIOSen corrupting CPU/PMU state and continue
    perf, x86: P4 PMU - Read proper MSR register to catch unflagged overflows
    perf symbols: Look at .dynsym again if .symtab not found
    perf build-id: Add quirk to deal with perf.data file format breakage
    perf session: Pass evsel in event_ops->sample()
    perf: Better fit max unprivileged mlock pages for tools needs
    perf_events: Fix stale ->cgrp pointer in update_cgrp_time_from_cpuctx()
    perf top: Fix uninitialized 'counter' variable
    tracing: Fix set_ftrace_filter probe function display
    perf, x86: Fix Intel fixed counters base initialization

    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: Provide locked setter for chip, handler, name
    genirq: Provide a lockdep helper
    genirq; Remove the last leftovers of the old sparse irq code

    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:
    futex: Fix WARN_ON() test for UP
    WARN_ON_SMP(): Allow use in if() statements on UP
    x86, dumpstack: Use %pB format specifier for stack trace
    vsprintf: Introduce %pB format specifier
    lockdep: Remove unused 'factor' variable from lockdep_stats_show()

    Linus Torvalds
     
  • * 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (28 commits)
    Cleanup XDR parsing for LAYOUTGET, GETDEVICEINFO
    NFSv4.1 convert layoutcommit sync to boolean
    NFSv4.1 pnfs_layoutcommit_inode fixes
    NFS: Determine initial mount security
    NFS: use secinfo when crossing mountpoints
    NFS: Add secinfo procedure
    NFS: lookup supports alternate client
    NFS: convert call_sync() to a function
    NFSv4.1 remove temp code that prevented ds commits
    NFSv4.1: layoutcommit
    NFSv4.1: filelayout driver specific code for COMMIT
    NFSv4.1: remove GETATTR from ds commits
    NFSv4.1: add generic layer hooks for pnfs COMMIT
    NFSv4.1: alloc and free commit_buckets
    NFSv4.1: shift filelayout_free_lseg
    NFSv4.1: pull out code from nfs_commit_release
    NFSv4.1: pull error handling out of nfs_commit_list
    NFSv4.1: add callback to nfs4_commit_done
    NFSv4.1: rearrange nfs_commit_rpcsetup
    NFSv4.1: don't send COMMIT to ds for data sync writes
    ...

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (43 commits)
    ext4: fix a BUG in mb_mark_used during trim.
    ext4: unused variables cleanup in fs/ext4/extents.c
    ext4: remove redundant set_buffer_mapped() in ext4_da_get_block_prep()
    ext4: add more tracepoints and use dev_t in the trace buffer
    ext4: don't kfree uninitialized s_group_info members
    ext4: add missing space in printk's in __ext4_grp_locked_error()
    ext4: add FITRIM to compat_ioctl.
    ext4: handle errors in ext4_clear_blocks()
    ext4: unify the ext4_handle_release_buffer() api
    ext4: handle errors in ext4_rename
    jbd2: add COW fields to struct jbd2_journal_handle
    jbd2: add the b_cow_tid field to journal_head struct
    ext4: Initialize fsync transaction ids in ext4_new_inode()
    ext4: Use single thread to perform DIO unwritten convertion
    ext4: optimize ext4_bio_write_page() when no extent conversion is needed
    ext4: skip orphan cleanup if fs has unknown ROCOMPAT features
    ext4: use the nblocks arg to ext4_truncate_restart_trans()
    ext4: fix missing iput of root inode for some mount error paths
    ext4: make FIEMAP and delayed allocation play well together
    ext4: suppress verbose debugging information if malloc-debug is off
    ...

    Fi up conflicts in fs/ext4/super.c due to workqueue changes

    Linus Torvalds
     
  • Some archs want to print extra information for certain irq_chips which
    is per irq and not per chip. Allow them to provide a chip callback to
    print the chip name and the extra information.

    PowerPC wants to print the LEVEL/EDGE type information. Make it configurable.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     

25 Mar, 2011

22 commits

  • Both WARN_ON() and WARN_ON_SMP() should be able to be used in
    an if statement.

    if (WARN_ON_SMP(foo)) { ... }

    Because WARN_ON_SMP() is defined as a do { } while (0) on UP,
    it can not be used this way.

    Convert it to the same form that WARN_ON() is, even when
    CONFIG_SMP is off.

    Signed-off-by: Steven Rostedt
    Acked-by: Thomas Gleixner
    Acked-by: Peter Zijlstra
    Acked-by: Darren Hart
    Cc: Lai Jiangshan
    Cc: Linus Torvalds
    Cc: Andrew Morton
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Steven Rostedt
     
  • When we set up the flow informations in ip_route_newports(), we take
    the address informations from the the rt_key_src and rt_key_dst fields
    of the rtable. They appear to be empty. So take the address
    informations from rt_src and rt_dst instead. This issue was introduced
    by commit 5e2b61f78411be25f0b84f97d5b5d312f184dfd1 ("ipv4: Remove
    flowi from struct rtable.")

    Signed-off-by: Steffen Klassert
    Signed-off-by: David S. Miller

    Steffen Klassert
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
    fs: simplify iget & friends
    fs: pull inode->i_lock up out of writeback_single_inode
    fs: rename inode_lock to inode_hash_lock
    fs: move i_wb_list out from under inode_lock
    fs: move i_sb_list out from under inode_lock
    fs: remove inode_lock from iput_final and prune_icache
    fs: Lock the inode LRU list separately
    fs: factor inode disposal
    fs: protect inode->i_state with inode->i_lock
    autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd()
    autofs4 - remove autofs4_lock
    autofs4 - fix d_manage() return on rcu-walk
    autofs4 - fix autofs4_expire_indirect() traversal
    autofs4 - fix dentry leak in autofs4_expire_direct()
    autofs4 - reinstate last used update on access
    vfs - check non-mountpoint dentry might block in __follow_mount_rcu()

    Linus Torvalds
     
  • All that remains of the inode_lock is protecting the inode hash list
    manipulation and traversals. Rename the inode_lock to
    inode_hash_lock to reflect it's actual function.

    Signed-off-by: Dave Chinner
    Signed-off-by: Al Viro

    Dave Chinner
     
  • Protect the inode writeback list with a new global lock
    inode_wb_list_lock and use it to protect the list manipulations and
    traversals. This lock replaces the inode_lock as the inodes on the
    list can be validity checked while holding the inode->i_lock and
    hence the inode_lock is no longer needed to protect the list.

    Signed-off-by: Dave Chinner
    Signed-off-by: Al Viro

    Dave Chinner
     
  • Protect inode state transitions and validity checks with the
    inode->i_lock. This enables us to make inode state transitions
    independently of the inode_lock and is the first step to peeling
    away the inode_lock from the code.

    This requires that __iget() is done atomically with i_state checks
    during list traversals so that we don't race with another thread
    marking the inode I_FREEING between the state check and grabbing the
    reference.

    Also remove the unlock_new_inode() memory barrier optimisation
    required to avoid taking the inode_lock when clearing I_NEW.
    Simplify the code by simply taking the inode->i_lock around the
    state change and wakeup. Because the wakeup is no longer tricky,
    remove the wake_up_inode() function and open code the wakeup where
    necessary.

    Signed-off-by: Dave Chinner
    Signed-off-by: Al Viro

    Dave Chinner
     
  • Move the scope value out of the fib alias entries and into fib_info,
    so that we always use the correct scope when recomputing the nexthop
    cached source address.

    Reported-by: Julian Anastasov
    Signed-off-by: David S. Miller

    David S. Miller
     
  • Commit ddd588b5dd55 ("oom: suppress nodes that are not allowed from
    meminfo on oom kill") moved lib/show_mem.o out of lib/lib.a, which
    resulted in build warnings on all architectures that implement their own
    versions of show_mem():

    lib/lib.a(show_mem.o): In function `show_mem':
    show_mem.c:(.text+0x1f4): multiple definition of `show_mem'
    arch/sparc/mm/built-in.o:(.text+0xd70): first defined here

    The fix is to remove __show_mem() and add its argument to show_mem() in
    all implementations to prevent this breakage.

    Architectures that implement their own show_mem() actually don't do
    anything with the argument yet, but they could be made to filter nodes
    that aren't allowed in the current context in the future just like the
    generic implementation.

    Reported-by: Stephen Rothwell
    Reported-by: James Bottomley
    Suggested-by: Andrew Morton
    Signed-off-by: David Rientjes
    Signed-off-by: Linus Torvalds

    David Rientjes
     
  • Any operation that:

    1) Brings up an interface
    2) Adds an IP address to an interface
    3) Deletes an IP address from an interface

    can potentially invalidate the nh_saddr value, requiring
    it to be recomputed.

    Perform the recomputation lazily using a generation ID.

    Reported-by: Julian Anastasov
    Signed-off-by: David S. Miller

    David S. Miller
     
  • * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
    drm/vblank: update recently added vbl interface to be more future proof.
    drm radeon: Return -EINVAL on wrong pm sysfs access
    drm/radeon/kms: fix hardcoded EDID handling
    Revert "drm/i915: Don't save/restore hardware status page address register"
    drm/i915: Avoid unmapping pages from a NULL address space
    drm/i915: Fix use after free within tracepoint
    drm/i915: Restore missing command flush before interrupt on BLT ring
    drm/i915: Disable pagefaults along execbuffer relocation fast path
    drm/i915: Fix computation of pitch for dumb bo creator
    drm/i915: report correct render clock frequencies on SNB
    drm/i915/dp: Correct the order of deletion for ghost eDP devices
    drm/i915: Fix tiling corruption from pipelined fencing
    drm/i915: Re-enable self-refresh
    drm/i915: Prevent racy removal of request from client list
    drm/i915: skip redundant operations whilst enabling pipes and planes
    drm/i915: Remove surplus POSTING_READs before wait_for_vblank
    drm/radeon/kms: prefer legacy pll algo for tv-out
    drm: check for modesetting on modeset ioctls
    drm/kernel: vblank wait on crtc > 1
    drm: Fix use-after-free in drm_gem_vm_close()

    Linus Torvalds
     
  • Trond Myklebust
     
  • changes LAYOUTGET and GETDEVICEINFO XDR parsing to:
    - not use vmap, which doesn't work on incoherent archs
    - use xdr_stream parsing for all xdr

    Signed-off-by: Weston Andros Adamson
    Signed-off-by: Trond Myklebust

    Weston Andros Adamson
     
  • When sec= is not presented as a mount option,
    we should attempt to determine what security flavor the
    server is using.

    Signed-off-by: Bryan Schumaker
    Signed-off-by: Trond Myklebust

    Bryan Schumaker
     
  • A submount may use different security than the parent
    mount does. We should figure out what sec flavor the
    submount uses at mount time.

    Signed-off-by: Bryan Schumaker
    Signed-off-by: Trond Myklebust

    Bryan Schumaker
     
  • This patch adds the nfs4 operation secinfo as a
    valid nfs rpc operation.

    Signed-off-by: Bryan Schumaker
    Signed-off-by: Trond Myklebust

    Bryan Schumaker
     
  • A later patch will need to perform a lookup using an
    alternate client with a different security flavor.
    This patch adds support for doing that on NFS v4.

    Signed-off-by: Bryan Schumaker
    Signed-off-by: Trond Myklebust

    Bryan Schumaker
     
  • * 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
    Documentation/iostats.txt: bit-size reference etc.
    cfq-iosched: removing unnecessary think time checking
    cfq-iosched: Don't clear queue stats when preempt.
    blk-throttle: Reset group slice when limits are changed
    blk-cgroup: Only give unaccounted_time under debug
    cfq-iosched: Don't set active queue in preempt
    block: fix non-atomic access to genhd inflight structures
    block: attempt to merge with existing requests on plug flush
    block: NULL dereference on error path in __blkdev_get()
    cfq-iosched: Don't update group weights when on service tree
    fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
    block: Require subsystems to explicitly allocate bio_set integrity mempool
    jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
    jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
    fs: make fsync_buffers_list() plug
    mm: make generic_writepages() use plugging
    blk-cgroup: Add unaccounted time to timeslice_used.
    block: fixup plugging stubs for !CONFIG_BLOCK
    block: remove obsolete comments for blkdev_issue_zeroout.
    blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
    ...

    Fix up conflicts in fs/{aio.c,super.c}

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
    MN10300: gcc 4.6 vs am33 inline assembly
    MN10300: Deprecate gdbstub
    MN10300: Allow KGDB to use the MN10300 serial ports
    MN10300: Emulate single stepping in KGDB on MN10300
    MN10300: Generalise kernel debugger kernel halt, reboot or power off hook
    KGDB: Notify GDB of machine halt, reboot or power off
    MN10300: Use KGDB
    MN10300: Create generic kernel debugger hooks
    MN10300: Create general kernel debugger cache flushing
    MN10300: Introduce a general config option for kernel debugger hooks
    MN10300: The icache invalidate functions should disable the icache first
    MN10300: gdbstub: Restrict single-stepping to non-preemptable non-SMP configs

    Linus Torvalds
     
  • * 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
    mmc: Add MMC_PROGRESS_*
    mmc, ARM: Rename SuperH Mobile ARM zboot helpers
    ARM: mach-shmobile: add coherent DMA mask to CEU camera devices
    ARM: mach-shmobile: Dynamic backlight control for Mackerel

    Linus Torvalds
     
  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
    [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
    [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
    [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
    [media] v4l: soc-camera: Store negotiated buffer settings
    [media] rc: interim support for 32-bit NEC-ish scancodes
    [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
    [media] lirc_zilog: error out if buffer read bytes != chunk size
    [media] lirc: silence some compile warnings
    [media] hdpvr: use same polling interval as other OS
    [media] ir-kbd-i2c: pass device code w/key in hauppauge case
    [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
    [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
    [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
    [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
    [media] rc-rc5-hauppauge-new: Add support for the old Black RC
    [media] rc-rc5-hauppauge-new: Add the old control to the table
    [media] rc-winfast: Fix the keycode tables
    [media] a800: Fix a few wrong IR key assignments
    [media] opera1: Use multimedia keys instead of an app-specific mapping
    [media] dw2102: Use multimedia keys instead of an app-specific mapping
    ...

    Fix up trivial conflicts (remove/modify and some real conflicts) in:
    arch/arm/mach-omap2/devices.c
    drivers/staging/Kconfig
    drivers/staging/Makefile
    drivers/staging/dabusb/dabusb.c
    drivers/staging/dabusb/dabusb.h
    drivers/staging/easycap/easycap_ioctl.c
    drivers/staging/usbvideo/usbvideo.c
    drivers/staging/usbvideo/vicam.c

    Linus Torvalds
     
  • * 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
    spi/pl022: Add loopback support for the SPI on 5500
    spi/omap_mcspi: Fix broken last word xfer
    of/flattree: minor cleanups
    dt: eliminate OF_NO_DEEP_PROBE and test for NULL match table
    dt: protect against NULL matches passed to of_match_node()
    dt: Refactor of_platform_bus_probe()

    Linus Torvalds
     
  • This is my second attempt to make this enum generally available.
    The first attempt added MMCIF_PROGRESS_* to include/linux/mmc/sh_mmcif.h.
    However this is not sufficiently generic as the enum will be
    used by SDHI boot code.

    Signed-off-by: Simon Horman
    Signed-off-by: Paul Mundt

    Simon Horman
     

24 Mar, 2011

4 commits

  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (42 commits)
    ACPI: minor printk format change in acpi_pad
    ACPI: make acpi_pad /sys output more readable
    ACPICA: Update version to 20110316
    ACPICA: Header support for SLIC table
    ACPI: Make sure the FADT is at least rev 2 before using the reset register
    ACPI: Bug compatibility for Windows on the ACPI reboot vector
    ACPICA: Fix access width for reset vector
    ACPI battery: fribble sysfs files from a resume notifier
    ACPI button: remove unused procfs I/F
    ACPI, APEI, Add PCIe AER error information printing support
    PCIe, AER, use pre-generated prefix in error information printing
    ACPI, APEI, Add ERST record ID cache
    ACPI: Use syscore_ops instead of sysdev class and sysdev
    ACPI: Remove the unused EC sysdev class
    ACPI: use __cpuinit for the acpi_processor_set_pdc() call tree
    ACPI: use __init where possible in processor driver
    Thermal_Framework-Fix_crash_during_hwmon_unregister
    ACPICA: Update version to 20110211.
    ACPICA: Add mechanism to defer _REG methods for some installed handlers
    ACPICA: Add support for FunctionalFixedHW in acpi_ut_get_region_name
    ...

    Linus Torvalds
     
  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (90 commits)
    mfd: Push byte swaps out of wm8994 bulk read path
    mfd: Rename ab8500 gpadc header
    mfd: Constify WM8994 write path
    mfd: Push byte swap out of WM8994 bulk I/O
    mfd: Avoid copying data in WM8994 I2C write
    mfd: Remove copy from WM831x I2C write function
    mfd: Staticise WM8994 PM ops
    regulator: Add a subdriver for TI TPS6105x regulator portions v2
    mfd: Add a core driver for TI TPS61050/TPS61052 chips v2
    gpio: Add Tunnel Creek support to sch_gpio
    mfd: Add Tunnel Creek support to lpc_sch
    pci_ids: Add Intel Tunnel Creek LPC Bridge device ID.
    regulator: MAX8997/8966 support
    mfd: Add WM8994 bulk register write operation
    mfd: Append additional read write on 88pm860x
    mfd: Adopt mfd_data in 88pm860x input driver
    mfd: Adopt mfd_data in 88pm860x regulator
    mfd: Adopt mfd_data in 88pm860x led
    mfd: Adopt mfd_data in 88pm860x backlight
    mfd: Fix MAX8997 Kconfig entry typos
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (140 commits)
    MAINTAINERS: de-orphan fbdev.
    MAINTAINERS: Add file pattern for fb dt bindings.
    video: Move sm501fb devicetree binding documentation to a better place.
    fbcon: fix situation where fbcon gets deinitialised and can't reinit.
    video, sm501: add OF binding to support SM501
    video, sm501: add edid and commandline support
    video, sm501: add I/O functions for use on powerpc
    video: Fix EDID macros H_SYNC_WIDTH and H_SYNC_OFFSET
    fbcon: Bugfix soft cursor detection in Tile Blitting
    video: add missing framebuffer_release in error path
    video: metronomefb: add __devexit_p around reference to metronomefb_remove
    video: hecubafb: add __devexit_p around reference to hecubafb_remove
    drivers:video:aty:radeon_base Fix typo occationally to occasionally
    atmel_lcdfb: add fb_blank function
    atmel_lcdfb: implement inverted contrast pwm
    video: s3c-fb: return proper error if clk_get fails
    uvesafb,vesafb: create WC or WB PAT-entries
    video: ffb: fix ffb_probe error path
    radeonfb: Let hwmon driver probe the "monid" I2C bus
    fbdev: sh_mobile_lcdc: checking NULL instead of IS_ERR()
    ...

    Linus Torvalds
     
  • Add DM_SECURE_DATA_FLAG which userspace can use to ensure
    that all buffers allocated for dm-ioctl are wiped
    immediately after use.

    The user buffer is wiped as well (we do not want to keep
    and return sensitive data back to userspace if the flag is set).

    Wiping is useful for cryptsetup to ensure that the key
    is present in memory only in defined places and only
    for the time needed.

    (For crypt, key can be present in table during load or table
    status, wait and message commands).

    Signed-off-by: Milan Broz
    Signed-off-by: Alasdair G Kergon

    Milan Broz