1. 23 Jul, 2011 6 commits
  2. 22 Jul, 2011 34 commits
    • Linus Torvalds's avatar
      Merge branch 'timers-rtc-for-linus' of... · 52de84f3
      Linus Torvalds authored
      Merge branch 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Serialize EFI time accesses on rtc_lock
        x86: Serialize SMP bootup CMOS accesses on rtc_lock
        rtc: stmp3xxx: Remove UIE handlers
        rtc: stmp3xxx: Get rid of mach-specific accessors
        rtc: stmp3xxx: Initialize drvdata before registering device
        rtc: stmp3xxx: Port stmp-functions to mxs-equivalents
        rtc: stmp3xxx: Restore register definitions
        rtc: vt8500: Use define instead of hardcoded value for status bit
      52de84f3
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of... · 112ec469
      Linus Torvalds authored
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        time: Fix stupid KERN_WARN compile issue
        rtc: Avoid accumulating time drift in suspend/resume
        time: Avoid accumulating time drift in suspend/resume
        time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime
      112ec469
    • Linus Torvalds's avatar
      Merge branch 'timers-cleanup-for-linus' of... · a99a7d14
      Linus Torvalds authored
      Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/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
      a99a7d14
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · bdc7ccfc
      Linus Torvalds authored
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/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
        ...
      bdc7ccfc
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of... · 4d4abdcb
      Linus Torvalds authored
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/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
        ...
      4d4abdcb
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of... · 0342cbcf
      Linus Torvalds authored
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * '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()
      0342cbcf
    • Linus Torvalds's avatar
      Merge branch 'core-printk-for-linus' of... · 391d6276
      Linus Torvalds authored
      Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        lockdep: Fix trace_[soft,hard]irqs_[on,off]() recursion
        printk: Fix console_sem vs logbuf_lock unlock race
        printk: Release console_sem after logbuf_lock
      391d6276
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of... · 75b56ec2
      Linus Torvalds authored
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/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
      75b56ec2
    • Linus Torvalds's avatar
      Merge branch 'core-iommu-for-linus' of... · 6d16d6d9
      Linus Torvalds authored
      Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/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
      6d16d6d9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · 431bf99d
      Linus Torvalds authored
      * '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
        ...
      431bf99d
    • Linus Torvalds's avatar
      Merge branch 'for-linus-core' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 72f96e0e
      Linus Torvalds authored
      * '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
        ...
      72f96e0e
    • Linus Torvalds's avatar
      17413f5a
    • Linus Torvalds's avatar
      Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 5a791ea4
      Linus Torvalds authored
      * '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]()
      5a791ea4
    • Linus Torvalds's avatar
      Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc · 8209f53d
      Linus Torvalds authored
      * '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()/
        ...
      8209f53d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 22a3b977
      Linus Torvalds authored
      * '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
        ...
      22a3b977
    • Linus Torvalds's avatar
      Merge branch 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · acb41c0f
      Linus Torvalds authored
      * '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
      acb41c0f
    • Linus Torvalds's avatar
      Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6 · 8181780c
      Linus Torvalds authored
      * '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
      8181780c
    • Linus Torvalds's avatar
      Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 · 7235dd74
      Linus Torvalds authored
      * 'spi/next' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
        spi/imx: add device tree probe support
        spi/imx: copy gpio number passed by platform data into driver private data
        spi/imx: use soc name in spi device type naming scheme
        spi/imx: merge type SPI_IMX_VER_0_7 into SPI_IMX_VER_0_4
        spi/imx: do not use spi_imx2_3 to name SPI_IMX_VER_2_3 function and macro
        spi/imx: use mx21 to name SPI_IMX_VER_0_0 function and macro
        spi/imx: do not make copy of spi_imx_devtype_data
        spi/dw: Add spi number into spi irq desc
        spi/tegra: Use engineering names in DT compatible property
        spi/fsl_spi: fix CPM spi driver
        mach-s3c2410: remove unused spi-gpio.h file
        spi: remove obsolete spi-s3c24xx-gpio driver
        mach-gta2: remove unused spi-gpio.h include
        mach-qt2410: convert to spi_gpio
        mach-jive: convert to spi_gpio
        spi/pxa2xx: Remove unavailable ssp_type from documentation
        spi/bfin_spi: uninline fat queue funcs
        spi/bfin_spi: constify pin array
        spi/bfin_spi: use structs for accessing hardware regs
        spi/topcliff-pch: Support new device ML7223 IOH
        ...
      
      Fix up trivial conflict in arch/arm/mach-ep93xx/Makefile
      7235dd74
    • Linus Torvalds's avatar
      Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 · c7c85184
      Linus Torvalds authored
      * '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.
        ...
      c7c85184
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · ece236ce
      Linus Torvalds authored
      * '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
        ...
      ece236ce
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 441c196e
      Linus Torvalds authored
      * '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
      441c196e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 951cc93a
      Linus Torvalds authored
      * 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
        ...
      951cc93a
    • Jiri Kosina's avatar
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · a7e1aabb
      Linus Torvalds authored
      * 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
      a7e1aabb
    • Linus Torvalds's avatar
      Merge branch 'stable/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · 111ad119
      Linus Torvalds authored
      * '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
      111ad119
    • Linus Torvalds's avatar
      Merge branch 'stable/pci.cleanups.v1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · 997271cf
      Linus Torvalds authored
      * '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.
      997271cf
    • Linus Torvalds's avatar
      896d0179
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · 0df55ea5
      Linus Torvalds authored
      * '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.
        ...
      0df55ea5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · c1f792a5
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (49 commits)
        xfs: add size update tracepoint to IO completion
        xfs: convert AIL cursors to use struct list_head
        xfs: remove confusing ail cursor wrapper
        xfs: use a cursor for bulk AIL insertion
        xfs: failure mapping nfs fh to inode should return ESTALE
        xfs: Remove the second parameter to xfs_sb_count()
        xfs: remove the dead XFS_DABUF_DEBUG code
        xfs: remove leftovers of the old btree tracing code
        xfs: remove the dead QUOTADEBUG code
        xfs: remove the unused xfs_buf_delwri_sort function
        xfs: remove wrappers around b_iodone
        xfs: remove wrappers around b_fspriv
        xfs: add a proper transaction pointer to struct xfs_buf
        xfs: factor out xfs_da_grow_inode_int
        xfs: factor out xfs_dir2_leaf_find_stale
        xfs: cleanup struct xfs_dir2_free
        xfs: reshuffle dir2 headers
        xfs: start periodic workers later
        Revert "xfs: fix filesystsem freeze race in xfs_trans_alloc"
        xfs: remove variables that serve no purpose in xfs_alloc_ag_vextent_exact()
        ...
      c1f792a5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · 6aaf4404
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: don't limit active work items
        dlm: use workqueue for callbacks
        dlm: remove deadlock debug print
        dlm: improve rsb searches
        dlm: keep lkbs in idr
        dlm: fix kmalloc args
        dlm: don't do pointless NULL check, use kzalloc and fix order of arguments
        dlm: dump address of unknown node
        dlm: use vmalloc for hash tables
        dlm: show addresses in configfs
      6aaf4404
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus · ba1f9db9
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus:
        hfsplus: ensure bio requests are not smaller than the hardware sectors
        hfsplus: Add additional range check to handle on-disk corruptions
        hfsplus: Add error propagation for hfsplus_ext_write_extent_locked
        hfsplus: add error checking for hfs_find_init()
        hfsplus: lift the 2TB size limit
        hfsplus: fix overflow in hfsplus_read_wrapper
        hfsplus: fix overflow in hfsplus_get_block
        hfsplus: assignments inside `if' condition clean-up
      ba1f9db9
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 49302baa
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
        GFS2: combine duplicated block freeing routines
        GFS2: Add S_NOSEC support
        GFS2: Automatically adjust glock min hold time
        GFS2: Cache dir hash table in a contiguous buffer
      49302baa
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 · eadc3875
      Linus Torvalds authored
      * '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
      eadc3875
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · 59a7ac12
      Linus Torvalds authored
      * 'linux-next' of git://git.infradead.org/ubifs-2.6: (32 commits)
        MAINTAINERS: change e-mail of Adrian Hunter
        UBIFS: fix master node recovery
        UBIFS: improve power cut emulation testing
        UBIFS: rename recovery testing variables
        UBIFS: remove custom list of superblocks
        UBIFS: stop re-defining UBI operations
        UBIFS: switch to I/O helpers
        UBIFS: switch to ubifs_leb_write
        UBIFS: switch to ubifs_leb_read
        UBIFS: introduce more I/O helpers
        UBIFS: always print stacktrace when switching to R/O mode
        UBIFS: remove unused and unneeded debugging function
        UBIFS: add global debugfs knobs
        UBIFS: introduce debugfs helpers
        UBIFS: re-arrange debugging code a bit
        UBIFS: be more informative in failure mode
        UBIFS: switch self-check knobs to debugfs
        UBIFS: lessen amount of debugging check types
        UBIFS: introduce helper functions for debugging checks and tests
        UBIFS: amend debugging inode size check function prototype
        ...
      59a7ac12