23 Jul, 2011

30 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (107 commits)
    vfs: use ERR_CAST for err-ptr tossing in lookup_instantiate_filp
    isofs: Remove global fs lock
    jffs2: fix IN_DELETE_SELF on overwriting rename() killing a directory
    fix IN_DELETE_SELF on overwriting rename() on ramfs et.al.
    mm/truncate.c: fix build for CONFIG_BLOCK not enabled
    fs:update the NOTE of the file_operations structure
    Remove dead code in dget_parent()
    AFS: Fix silly characters in a comment
    switch d_add_ci() to d_splice_alias() in "found negative" case as well
    simplify gfs2_lookup()
    jfs_lookup(): don't bother with . or ..
    get rid of useless dget_parent() in btrfs rename() and link()
    get rid of useless dget_parent() in fs/btrfs/ioctl.c
    fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers
    drivers: fix up various ->llseek() implementations
    fs: handle SEEK_HOLE/SEEK_DATA properly in all fs's that define their own llseek
    Ext4: handle SEEK_HOLE/SEEK_DATA generically
    Btrfs: implement our own ->llseek
    fs: add SEEK_HOLE and SEEK_DATA flags
    reiserfs: make reiserfs default to barrier=flush
    ...

    Fix up trivial conflicts in fs/xfs/linux-2.6/xfs_super.c due to the new
    shrinker callout for the inode cache, that clashed with the xfs code to
    start the periodic workers later.

    Linus Torvalds
     
  • * 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86-64, vdso: Do not allocate memory for the vDSO
    clocksource: Change __ARCH_HAS_CLOCKSOURCE_DATA to a CONFIG option
    x86, vdso: Drop now wrong comment
    Document the vDSO and add a reference parser
    ia64: Replace clocksource.fsys_mmio with generic arch data
    x86-64: Move vread_tsc and vread_hpet into the vDSO
    clocksource: Replace vread with generic arch data
    x86-64: Add --no-undefined to vDSO build
    x86-64: Allow alternative patching in the vDSO
    x86: Make alternative instruction pointers relative
    x86-64: Improve vsyscall emulation CS and RIP handling
    x86-64: Emulate legacy vsyscalls
    x86-64: Fill unused parts of the vsyscall page with 0xcc
    x86-64: Remove vsyscall number 3 (venosys)
    x86-64: Map the HPET NX
    x86-64: Remove kernel.vsyscall64 sysctl
    x86-64: Give vvars their own page
    x86-64: Document some of entry_64.S
    x86-64: Fix alignment of jiffies variable

    Linus Torvalds
     
  • * 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, numa: Implement pfn -> nid mapping granularity check
    x86, mm: s/PAGES_PER_ELEMENT/PAGES_PER_SECTION/

    Linus Torvalds
     
  • * 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, mtrr: Use pci_dev->revision
    x86, mtrr: use stop_machine APIs for doing MTRR rendezvous
    stop_machine: implement stop_machine_from_inactive_cpu()
    stop_machine: reorganize stop_cpus() implementation
    x86, mtrr: lock stop machine during MTRR rendezvous sequence

    Linus Torvalds
     
  • * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, efi: Properly pre-initialize table pointers
    x86, efi: Add infrastructure for UEFI 2.0 runtime services
    x86, efi: Fix argument types for SetVariable()

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

    * 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    mips: Fix i8253 clockevent fallout
    i8253: Cleanup outb/inb magic
    arm: Footbridge: Use common i8253 clockevent
    mips: Use common i8253 clockevent
    x86: Use common i8253 clockevent
    i8253: Create common clockevent implementation
    i8253: Export i8253_lock unconditionally
    pcpskr: MIPS: Make config dependencies finer grained
    pcspkr: Cleanup Kconfig dependencies
    i8253: Move remaining content and delete asm/i8253.h
    i8253: Consolidate definitions of PIT_LATCH
    x86: i8253: Consolidate definitions of global_clock_event
    i8253: Alpha, PowerPC: Remove unused asm/8253pit.h
    alpha: i8253: Cleanup remaining users of i8253pit.h
    i8253: Remove I8253_LOCK config
    i8253: Make pcsp sound driver use the shared i8253_lock
    i8253: Make pcspkr input driver use the shared i8253_lock
    i8253: Consolidate all kernel definitions of i8253_lock
    i8253: Unify all kernel declarations of i8253_lock
    i8253: Create linux/i8253.h and use it in all 8253 related files

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

    * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)
    sched: Cleanup duplicate local variable in [enqueue|dequeue]_task_fair
    sched: Replace use of entity_key()
    sched: Separate group-scheduling code more clearly
    sched: Reorder root_domain to remove 64 bit alignment padding
    sched: Do not attempt to destroy uninitialized rt_bandwidth
    sched: Remove unused function cpu_cfs_rq()
    sched: Fix (harmless) typo 'CONFG_FAIR_GROUP_SCHED'
    sched, cgroup: Optimize load_balance_fair()
    sched: Don't update shares twice on on_rq parent
    sched: update correct entity's runtime in check_preempt_wakeup()
    xtensa: Use generic config PREEMPT definition
    h8300: Use generic config PREEMPT definition
    m32r: Use generic PREEMPT config
    sched: Skip autogroup when looking for all rt sched groups
    sched: Simplify mutex_spin_on_owner()
    sched: Remove rcu_read_lock() from wake_affine()
    sched: Generalize sleep inside spinlock detection
    sched: Make sleeping inside spinlock detection working in !CONFIG_PREEMPT
    sched: Isolate preempt counting in its own config option
    sched: Remove pointless in_atomic() definition check
    ...

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

    * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (123 commits)
    perf: Remove the nmi parameter from the oprofile_perf backend
    x86, perf: Make copy_from_user_nmi() a library function
    perf: Remove perf_event_attr::type check
    x86, perf: P4 PMU - Fix typos in comments and style cleanup
    perf tools: Make test use the preset debugfs path
    perf tools: Add automated tests for events parsing
    perf tools: De-opt the parse_events function
    perf script: Fix display of IP address for non-callchain path
    perf tools: Fix endian conversion reading event attr from file header
    perf tools: Add missing 'node' alias to the hw_cache[] array
    perf probe: Support adding probes on offline kernel modules
    perf probe: Add probed module in front of function
    perf probe: Introduce debuginfo to encapsulate dwarf information
    perf-probe: Move dwarf library routines to dwarf-aux.{c, h}
    perf probe: Remove redundant dwarf functions
    perf probe: Move strtailcmp to string.c
    perf probe: Rename DIE_FIND_CB_FOUND to DIE_FIND_CB_END
    tracing/kprobe: Update symbol reference when loading module
    tracing/kprobes: Support module init function probing
    kprobes: Return -ENOENT if probe point doesn't exist
    ...

    Linus Torvalds
     
  • * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    rcu: Fix wrong check in list_splice_init_rcu()
    net,rcu: Convert call_rcu(xt_rateest_free_rcu) to kfree_rcu()
    sysctl,rcu: Convert call_rcu(free_head) to kfree
    vmalloc,rcu: Convert call_rcu(rcu_free_vb) to kfree_rcu()
    vmalloc,rcu: Convert call_rcu(rcu_free_va) to kfree_rcu()
    ipc,rcu: Convert call_rcu(ipc_immediate_free) to kfree_rcu()
    ipc,rcu: Convert call_rcu(free_un) to kfree_rcu()
    security,rcu: Convert call_rcu(sel_netport_free) to kfree_rcu()
    security,rcu: Convert call_rcu(sel_netnode_free) to kfree_rcu()
    ia64,rcu: Convert call_rcu(sn_irq_info_free) to kfree_rcu()
    block,rcu: Convert call_rcu(disk_free_ptbl_rcu_cb) to kfree_rcu()
    scsi,rcu: Convert call_rcu(fc_rport_free_rcu) to kfree_rcu()
    audit_tree,rcu: Convert call_rcu(__put_tree) to kfree_rcu()
    security,rcu: Convert call_rcu(whitelist_item_free) to kfree_rcu()
    md,rcu: Convert call_rcu(free_conf) to kfree_rcu()

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

    * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    lockdep: Fix lockdep_no_validate against IRQ states
    mutex: Make mutex_destroy() an inline function
    plist: Remove the need to supply locks to plist heads
    lockup detector: Fix reference to the non-existent CONFIG_DETECT_SOFTLOCKUP option

    Linus Torvalds
     
  • Fix build error when CONFIG_BLOCK is not enabled by providing a stub
    inode_dio_wait() function.

    mm/truncate.c:612: error: implicit declaration of function 'inode_dio_wait'

    Signed-off-by: Randy Dunlap
    Signed-off-by: Al Viro

    Randy Dunlap
     
  • …/git/tip/linux-2.6-tip

    * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    iommu/core: Fix build with INTR_REMAP=y && CONFIG_DMAR=n
    iommu/amd: Don't use MSI address range for DMA addresses
    iommu/amd: Move missing parts to drivers/iommu
    iommu: Move iommu Kconfig entries to submenu
    x86/ia64: intel-iommu: move to drivers/iommu/
    x86: amd_iommu: move to drivers/iommu/
    msm: iommu: move to drivers/iommu/
    drivers: iommu: move to a dedicated folder
    x86/amd-iommu: Store device alias as dev_data pointer
    x86/amd-iommu: Search for existind dev_data before allocting a new one
    x86/amd-iommu: Allow dev_data->alias to be NULL
    x86/amd-iommu: Use only dev_data in low-level domain attach/detach functions
    x86/amd-iommu: Use only dev_data for dte and iotlb flushing routines
    x86/amd-iommu: Store ATS state in dev_data
    x86/amd-iommu: Store devid in dev_data
    x86/amd-iommu: Introduce global dev_data_list
    x86/amd-iommu: Remove redundant device_flush_dte() calls
    iommu-api: Add missing header file

    Fix up trivial conflicts (independent additions close to each other) in
    drivers/Makefile and include/linux/pci.h

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (51 commits)
    PM: Improve error code of pm_notifier_call_chain()
    PM: Add "RTC" to PM trace time stamps to avoid confusion
    PM / Suspend: Export suspend_set_ops, suspend_valid_only_mem
    PM / Suspend: Add .suspend_again() callback to suspend_ops
    PM / OPP: Introduce function to free cpufreq table
    ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active
    PM / Domains: Take .power_off() error code into account
    ARM / shmobile: Use genpd_queue_power_off_work()
    ARM / shmobile: Use pm_genpd_poweroff_unused()
    PM / Domains: Introduce function to power off all unused PM domains
    OMAP: PM: disable idle on suspend for GPIO and UART
    OMAP: PM: omap_device: add API to disable idle on suspend
    OMAP: PM: omap_device: add system PM methods for PM domain handling
    OMAP: PM: omap_device: conditionally use PM domain runtime helpers
    PM / Runtime: Add new helper function: pm_runtime_status_suspended()
    PM / Domains: Queue up power off work only if it is not pending
    PM / Domains: Improve handling of wakeup devices during system suspend
    PM / Domains: Do not restore all devices on power off error
    PM / Domains: Allow callbacks to execute all runtime PM helpers
    PM / Domains: Do not execute device callbacks under locks
    ...

    Linus Torvalds
     
  • * 'for-linus-core' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (38 commits)
    target: Bump version to v4.1.0-rc1-ml
    target: remove custom hex2bin() implementation
    target: fix typo Assoication -> Association
    target: Update QUEUE ALGORITHM MODIFIER control page default
    target: ->map_task_SG conversion to ->map_control_SG and ->map_data_SG
    target: Follow up core updates from AGrover and HCH (round 4)
    target: Eliminate usage of struct se_mem
    target: Pass 2nd param of transport_split_cdb by value
    target: Enforce 1 page max for control cdb buffer sizes
    target: Make all control CDBs scatter-gather
    target: Implement Block Device Characteristics VPD page
    target: Fix reporting of supported VPD pages
    target: Allow for built-in target modules
    tcm_fc: Convert to wake_up_process and schedule_timeout_interruptible
    tcm_fc: Makefile cleanups
    loopback: Fix memory leak in tcm_loop_make_scsi_hba()
    loopback: Remove duplicate scsi/scsi_tcq.h include
    loopback: off by one in tcm_loop_make_naa_tpg()
    target/iblock: Remove unused iblock_dev members
    target/iblock: Use request_queue->nr_request for se_device defaults
    ...

    Linus Torvalds
     
  • * 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
    workqueue: separate out drain_workqueue() from destroy_workqueue()
    workqueue: remove cancel_rearming_delayed_work[queue]()

    Linus Torvalds
     
  • * 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc: (39 commits)
    ptrace: do_wait(traced_leader_killed_by_mt_exec) can block forever
    ptrace: fix ptrace_signal() && STOP_DEQUEUED interaction
    connector: add an event for monitoring process tracers
    ptrace: dont send SIGSTOP on auto-attach if PT_SEIZED
    ptrace: mv send-SIGSTOP from do_fork() to ptrace_init_task()
    ptrace_init_task: initialize child->jobctl explicitly
    has_stopped_jobs: s/task_is_stopped/SIGNAL_STOP_STOPPED/
    ptrace: make former thread ID available via PTRACE_GETEVENTMSG after PTRACE_EVENT_EXEC stop
    ptrace: wait_consider_task: s/same_thread_group/ptrace_reparented/
    ptrace: kill real_parent_is_ptracer() in in favor of ptrace_reparented()
    ptrace: ptrace_reparented() should check same_thread_group()
    redefine thread_group_leader() as exit_signal >= 0
    do not change dead_task->exit_signal
    kill task_detached()
    reparent_leader: check EXIT_DEAD instead of task_detached()
    make do_notify_parent() __must_check, update the callers
    __ptrace_detach: avoid task_detached(), check do_notify_parent()
    kill tracehook_notify_death()
    make do_notify_parent() return bool
    ptrace: s/tracehook_tracer_task()/ptrace_parent()/
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (31 commits)
    HID: fix support for Microsoft comfort mouse 4500
    HID: hid-multitouch: add one new multitouch device's VID/PID
    HID: prodikeys: remove a redundant forward declaration of struct pcmidi_snd
    HID: prodikeys: make needlessly global symbols static
    HID: emsff: properly handle emsff_init failure
    HID: ACRUX - add missing hid_hw_stop() in ax_probe() error path
    HID: fix horizontal wheel for ms comfort mouse 4500
    HID: uclogic: Add support for UC-Logic WP1062
    HID: wiimote: Add sysfs support to wiimote driver
    HID: wiimote: Cache wiimote led state
    HID: wiimote: Add wiimote led request
    HID: wiimote: Add wiimote input button parser
    HID: wiimote: Add wiimote event handler
    HID: wiimote: Add output queue for wiimote driver
    HID: wiimote: Add wiimote send function
    HID: wiimote: Synchronize wiimote input and hid event handling
    HID: wiimote: Register input device in wiimote hid driver
    HID: wiimote: Add wiimote device structure
    HID: wiimote: Register wiimote hid driver stub
    HID: wiimote: Add Nintendo Wii Remote driver stub
    ...

    Linus Torvalds
     
  • * 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
    pci/of: Consolidate pci_bus_to_OF_node()
    pci/of: Consolidate pci_device_to_OF_node()
    x86/devicetree: Use generic PCI OF matching
    microblaze/pci: Move the remains of pci_32.c to pci-common.c
    microblaze/pci: Remove powermac originated cruft
    pci/of: Match PCI devices to OF nodes dynamically

    Linus Torvalds
     
  • * 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
    dt: include linux/errno.h in linux/of_address.h
    of/address: Add of_find_matching_node_by_address helper
    dt: remove extra xsysace platform_driver registration
    tty/serial: Add devicetree support for nVidia Tegra serial ports
    dt: add empty of_property_read_u32[_array] for non-dt
    dt: bindings: move SEC node under new crypto/
    dt: add helper function to read u32 arrays
    tty/serial: change of_serial to use new of_property_read_u32() api
    dt: add 'const' for of_property_read_string parameter **out_string
    dt: add helper functions to read u32 and string property values
    tty: of_serial: support for 32 bit accesses
    dt: document the of_serial bindings
    dt/platform: allow device name to be overridden
    drivers/amba: create devices from device tree
    dt: add of_platform_populate() for creating device from the device tree
    dt: Add default match table for bus ids

    Linus Torvalds
     
  • * 'gpio/next' of git://git.secretlab.ca/git/linux-2.6: (61 commits)
    gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming
    mcp23s08: add i2c support
    mcp23s08: isolate spi specific parts
    mcp23s08: get rid of setup/teardown callbacks
    gpio/tegra: dt: add binding for gpio polarity
    mcp23s08: remove unused work queue
    gpio/da9052: remove a redundant assignment for gpio->da9052
    gpio/mxc: add device tree probe support
    ARM: mxc: use ARCH_NR_GPIOS to define gpio number
    gpio/mxc: get rid of the uses of cpu_is_mx()
    gpio/mxc: add missing initialization of basic_mmio_gpio shadow variables
    gpio: Move mpc5200 gpio driver to drivers/gpio
    GPIO: DA9052 GPIO module v3
    gpio/tegra: Use engineering names in DT compatible property
    of/gpio: Add new method for getting gpios under different property names
    gpio/dt: Refine GPIO device tree binding
    gpio/ml-ioh: fix off-by-one for displaying variable i in dev_err
    gpio/pca953x: Deprecate meaningless device-tree bindings
    gpio/pca953x: Remove dynamic platform data pointer
    gpio/pca953x: Fix IRQ support.
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (26 commits)
    IB/qib: Defer HCA error events to tasklet
    mlx4_core: Bump the driver version to 1.0
    RDMA/cxgb4: Use printk_ratelimited() instead of printk_ratelimit()
    IB/mlx4: Support PMA counters for IBoE
    IB/mlx4: Use flow counters on IBoE ports
    IB/pma: Add include file for IBA performance counters definitions
    mlx4_core: Add network flow counters
    mlx4_core: Fix location of counter index in QP context struct
    mlx4_core: Read extended capabilities into the flags field
    mlx4_core: Extend capability flags to 64 bits
    IB/mlx4: Generate GID change events in IBoE code
    IB/core: Add GID change event
    RDMA/cma: Don't allow IPoIB port space for IBoE
    RDMA: Allow for NULL .modify_device() and .modify_port() methods
    IB/qib: Update active link width
    IB/qib: Fix potential deadlock with link down interrupt
    IB/qib: Add sysfs interface to read free contexts
    IB/mthca: Remove unnecessary read of PCI_CAP_ID_EXP
    IB/qib: Remove double define
    IB/qib: Remove unnecessary read of PCI_CAP_ID_EXP
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
    firewire: document the sysfs ABIs
    firewire: cdev: ABI documentation enhancements
    firewire: cdev: prevent race between first get_info ioctl and bus reset event queuing
    firewire: cdev: return -ENOTTY for unimplemented ioctls, not -EINVAL
    firewire: ohci: skip soft reset retries after card ejection
    firewire: ohci: fix PHY reg access after card ejection
    firewire: ohci: add a comment on PHY reg access serialization
    firewire: ohci: reduce potential context_stop latency
    firewire: ohci: remove superfluous posted write flushes
    firewire: net: replacing deprecated __attribute__((packed)) with __packed

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1287 commits)
    icmp: Fix regression in nexthop resolution during replies.
    net: Fix ppc64 BPF JIT dependencies.
    acenic: include NET_SKB_PAD headroom to incoming skbs
    ixgbe: convert to ndo_fix_features
    ixgbe: only enable WoL for magic packet by default
    ixgbe: remove ifdef check for non-existent define
    ixgbe: Pass staterr instead of re-reading status and error bits from descriptor
    ixgbe: Move interrupt related values out of ring and into q_vector
    ixgbe: add structure for containing RX/TX rings to q_vector
    ixgbe: inline the ixgbe_maybe_stop_tx function
    ixgbe: Update ATR to use recorded TX queues instead of CPU for routing
    igb: Fix for DH89xxCC near end loopback test
    e1000: always call e1000_check_for_link() on e1000_ce4100 MACs.
    netxen: add fw version compatibility check
    be2net: request native mode each time the card is reset
    ipv4: Constrain UFO fragment sizes to multiples of 8 bytes
    virtio_net: Fix panic in virtnet_remove
    ipv6: make fragment identifications less predictable
    ipv6: unshare inetpeers
    can: make function can_get_bittiming static
    ...

    Linus Torvalds
     
  • Jiri Kosina
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
    lguest: Fix in/out emulation
    lguest: Fix translation count about wikipedia's cpuid page
    lguest: Fix three simple typos in comments
    lguest: update comments
    lguest: Simplify device initialization.
    lguest: don't rewrite vmcall instructions
    lguest: remove remaining vmcall
    lguest: use a special 1:1 linear pagetable mode until first switch.
    lguest: Do not exit on non-fatal errors

    Linus Torvalds
     
  • * 'stable/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/pciback: Have 'passthrough' option instead of XEN_PCIDEV_BACKEND_PASS and XEN_PCIDEV_BACKEND_VPCI
    xen/pciback: Remove the DEBUG option.
    xen/pciback: Drop two backends, squash and cleanup some code.
    xen/pciback: Print out the MSI/MSI-X (PIRQ) values
    xen/pciback: Don't setup an fake IRQ handler for SR-IOV devices.
    xen: rename pciback module to xen-pciback.
    xen/pciback: Fine-grain the spinlocks and fix BUG: scheduling while atomic cases.
    xen/pciback: Allocate IRQ handler for device that is shared with guest.
    xen/pciback: Disable MSI/MSI-X when reseting a device
    xen/pciback: guest SR-IOV support for PV guest
    xen/pciback: Register the owner (domain) of the PCI device.
    xen/pciback: Cleanup the driver based on checkpatch warnings and errors.
    xen/pciback: xen pci backend driver.
    xen: tmem: self-ballooning and frontswap-selfshrinking
    xen: Add module alias to autoload backend drivers
    xen: Populate xenbus device attributes
    xen: Add __attribute__((format(printf... where appropriate
    xen: prepare tmem shim to handle frontswap
    xen: allow enable use of VGA console on dom0

    Linus Torvalds
     
  • * 'stable/pci.cleanups.v1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/pci: Use 'acpi_gsi_to_irq' value unconditionally.
    xen/pci: Remove 'xen_allocate_pirq_gsi'.
    xen/pci: Retire unnecessary #ifdef CONFIG_ACPI
    xen/pci: Move the allocation of IRQs when there are no IOAPIC's to the end
    xen/pci: Squash pci_xen_initial_domain and xen_setup_pirqs together.
    xen/pci: Use the xen_register_pirq for HVM and initial domain users
    xen/pci: In xen_register_pirq bind the GSI to the IRQ after the hypercall.
    xen/pci: Provide #ifdef CONFIG_ACPI to easy code squashing.
    xen/pci: Update comments and fix empty spaces.
    xen/pci: Shuffle code around.

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (78 commits)
    mmc: MAINTAINERS: add myself as a tmio-mmc maintainer
    mmc: print debug messages for runtime PM actions
    mmc: fix runtime PM with -ENOSYS suspend case
    mmc: at91_mci: move register header from include/ to drivers/
    mmc: mxs-mmc: fix clock rate setting
    mmc: tmio: fix a deadlock
    mmc: tmio: fix a recently introduced bug in DMA code
    mmc: sh_mmcif: maximize power saving
    mmc: tmio: maximize power saving
    mmc: tmio: fix recursive spinlock, don't schedule with interrupts disabled
    mmc: Added quirks for Ricoh 1180:e823 lower base clock frequency
    mmc: omap_hsmmc: fix oops in omap_hsmmc_dma_cb()
    mmc: omap_hsmmc: refactor duplicated code
    mmc: omap_hsmmc: fix a few bugs when setting the clock divisor
    mmc: omap_hsmmc: introduce start_clock and re-use stop_clock
    mmc: omap_hsmmc: split duplicate code to calc_divisor() function
    mmc: omap_hsmmc: move hardcoded frequency constants to defines
    mmc: omap_hsmmc: correct debug report error status mnemonics
    mmc: block: fixed NULL pointer dereference
    mmc: documentation of mmc non-blocking request usage and design.
    ...

    Linus Torvalds
     
  • * 'linux-next' of git://git.infradead.org/ubi-2.6:
    UBI: clarify the volume notification types' doc
    UBI: remove dead code
    UBI: dump stack when switching to R/O mode
    UBI: fix oops in error path
    UBI: switch debugging tests knobs to debugfs
    UBI: make it possible to use struct ubi_device in debug.h
    UBI: prepare debugging stuff to further debugfs conversion
    UBI: use debugfs for the extra checks knobs
    UBI: change the interface of a debugging check function

    Linus Torvalds
     
  • * 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
    slab: fix DEBUG_SLAB warning
    slab: shrink sizeof(struct kmem_cache)
    slab: fix DEBUG_SLAB build
    SLUB: Fix missing include
    slub: reduce overhead of slub_debug
    slub: Add method to verify memory is not freed
    slub: Enable backtrace for create/delete points
    slab allocators: Provide generic description of alignment defines
    slab, slub, slob: Unify alignment definition
    slob/lockdep: Fix gfp flags passed to lockdep

    Linus Torvalds
     

22 Jul, 2011

10 commits

  • This patch bumps the target core version to v4.1.0-rc1 now that we are
    in sync with upstream lio-core-2.6.git/master

    Signed-off-by: Nicholas Bellinger

    Nicholas Bellinger
     
  • This patch drops transport_asciihex_to_binaryhex() in favor of proper
    hex2bin usage from include/linux/kernel.h:hex2bin()

    Signed-off-by: Andy Shevchenko
    Signed-off-by: Nicholas Bellinger

    Andy Shevchenko
     
  • This patch adds the default 'Unrestricted reordering allowed' for SCSI
    control mode page QUEUE ALGORITHM MODIFIER on a per se_device basis in
    target_modesense_control() following spc4r23. This includes a new
    emuluate_rest_reord configfs attribute that currently (only) accepts
    zero to signal 'Unrestricted reordering allowed' in control mode page
    usage by the backend target device.

    Reported-by: Roland Dreier
    Signed-off-by: Nicholas Bellinger

    Nicholas Bellinger
     
  • This patch breaks up the ->map_task_SG() backend call into two seperate
    ->map_control_SG() and ->map_data_SG() in order to better address
    IBLOCK and pSCSI. IBLOCK only allocates bios for ->map_data_SG(), and
    pSCSI will allocate a struct request for both cases.

    This patch fixes incorrect usage of ->map_task_SG() for all se_cmd descriptors
    in transport_generic_new_cmd() by moving the call into it's proper location
    directly inside of transport_allocate_data_tasks()

    Reported-by: Christoph Hellwig
    Signed-off-by: Nicholas Bellinger

    Nicholas Bellinger
     
  • This patch contains the squashed version of forth round series cleanups
    from Andy and Christoph following the post heavy lifting in the preceeding:
    'Eliminate usage of struct se_mem' and 'Make all control CDBs scatter-gather'
    changes. This also includes a conversion of target core and the v3.0
    mainline fabric modules (loopback and tcm_fc) to use pr_debug and the
    CONFIG_DYNAMIC_DEBUG infrastructure!

    These have been squashed into this third and final round for v3.1.

    target: Remove ifdeffed code in t_g_process_write
    target: Remove direct ramdisk code
    target: Rename task_sg_num to task_sg_nents
    target: Remove custom debug macros for pr_debug. Use pr_err().
    target: Remove custom debug macros in mainline fabrics
    target: Set WSNZ=1 in block limits VPD. Abort if WRITE_SAME sectors = 0
    target: Remove transport do_se_mem_map callback
    target: Further simplify transport_free_pages
    target: Redo task allocation return value handling
    target: Remove extra parentheses
    target: change alloc_task call to take *cdb, not *cmd

    (nab: Fix bogus struct file assignments in fd_do_readv and fd_do_writev)

    Signed-off-by: Andy Grover
    Reviewed-by: Christoph Hellwig
    Signed-off-by: Nicholas Bellinger

    Andy Grover
     
  • Both backstores and fabrics use arrays of struct scatterlist to describe
    data buffers. However TCM used struct se_mems, basically a linked list
    of scatterlist entries. We are able to simplify the code by eliminating
    this intermediate data structure and just using struct scatterlist[]
    throughout.

    Also, moved attachment of task to cmd out of transport_generic_get_task
    and into allocate_control_task and allocate_data_tasks. The reasoning
    is that it's nonintuitive that get_task should automatically add it to
    the cmd's task list -- it should just return an allocated, initialized
    task. That's all it should do, based on the function's name, so either the
    function shouldn't do it, or the name should change to encapsulate the
    entire essence of what it does.

    (nab: Fix compile warnings in tcm_fc, and make transport_kmap_first_data_page
    honor sg->offset for SGLs from contigious memory with TCM_Loop, and
    fix control se_cmd descriptor memory leak)

    Signed-off-by: Andy Grover
    Signed-off-by: Nicholas Bellinger

    Andy Grover
     
  • Since sectors is not modified, it's more straightforward to do this.

    Signed-off-by: Andy Grover
    Signed-off-by: Nicholas Bellinger

    Andy Grover
     
  • Due to all cdbs' data buffers being referenced by scatterlists, buffers
    of more than a page are not contiguous. Instead of handling this in all
    control command handlers, we may be able to get away with just limiting
    control cdb data buffers to one page. The only control CDBs we handle that
    have potentially large data buffers are REPORT LUNS and UNMAP, so if we
    didn't want to live with this limitation, they would need to be modified
    to walk the pages in the data buffer's sgl.

    Signed-off-by: Andy Grover
    Signed-off-by: Nicholas Bellinger

    Andy Grover
     
  • Previously, some control CDBs did not allocate memory in pages for their
    data buffer, but just did a kmalloc. This patch makes all cdbs allocate
    pages.

    This has the benefit of streamlining some paths that had to behave
    differently when we used two allocation methods. The downside is that
    all accesses to the data buffer need to kmap it before use, and need to
    handle data in page-sized chunks if more than a page is needed for a given
    command's data buffer.

    Finally, note that cdbs with no data buffers are handled a little
    differently. Before, SCSI_NON_DATA_CDBs would not call get_mem at all
    (they'd be in the final else in transport_allocate_resources) but now
    these will make it into generic_get_mem, but just not allocate any
    buffers.

    Signed-off-by: Andy Grover
    Signed-off-by: Nicholas Bellinger

    Andy Grover
     
  • Implement page B1h, Block Device Characteristics, so that we can report
    a medium rotation rate of 1 (non-rotating / solid state) if the
    is_nonrot device attribute is set; we update the iblock backend to set
    this attribute if the underlying Linux block device has its nonrot
    flag set.

    Signed-off-by: Roland Dreier
    Reviewed-by: Christoph Hellwig
    Signed-off-by: Nicholas Bellinger

    Roland Dreier