24 Jun, 2009

8 commits

  • Signed-off-by: Al Viro

    Al Viro
     
  • No helpers, no conversions yet.

    Signed-off-by: Al Viro

    Al Viro
     
  • This patch adds ioctls to vfs for compatibility with legacy XFS
    pre-allocation ioctls (XFS_IOC_*RESVP*). The implementation
    effectively invokes sys_fallocate for the new ioctls.
    Also handles the compat_ioctl case.
    Note: These legacy ioctls are also implemented by OCFS2.

    [AV: folded fixes from hch]

    Signed-off-by: Ankit Jain
    Signed-off-by: Christoph Hellwig
    Signed-off-by: Al Viro

    Ankit Jain
     
  • After the recent changes that went into mm/vmscan.c to overhaul stuff, we
    ended up with these warnings on no-mmu systems:

    mm/vmscan.c: In function `shrink_page_list':
    mm/vmscan.c:580: warning: unused variable `vm_flags'
    mm/vmscan.c: In function `shrink_active_list':
    mm/vmscan.c:1294: warning: `vm_flags' may be used uninitialized in this function
    mm/vmscan.c:1242: note: `vm_flags' was declared here

    This is because the no-mmu function defines page_referenced() to work on
    the first argument only (the page). It does not clear the vm_flags given
    to it because for no-mmu systems, they never actually get utilized. Since
    that is no longer strictly true, we need to set vm_flags to 0 like
    everyone else so gcc can do proper dead code elimination without annoying
    us with unused warnings.

    Signed-off-by: Mike Frysinger
    Cc: David Howells
    Acked-by: David McCullough
    Cc: Greg Ungerer
    Cc: Paul Mundt
    Cc: Wu Fengguang
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mike Frysinger
     
  • If a kthread happens to use get_user_pages() on an mm (as KSM does),
    there's a chance that it will end up trying to read in a swap page, then
    oops in grab_swap_token() because the kthread has no mm: GUP passes down
    the right mm, so grab_swap_token() ought to be using it.

    We have not identified a stronger case than KSM's daemon (not yet in
    mainline), but the issue must have come up before, since RHEL has included
    a fix for this for years (though a different fix, they just back out of
    grab_swap_token if current->mm is unset: which is what we first proposed,
    but using the right mm here seems more correct).

    Reported-by: Izik Eidus
    Signed-off-by: Johannes Weiner
    Signed-off-by: Hugh Dickins
    Acked-by: Rik van Riel
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hugh Dickins
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (38 commits)
    fusion: mptsas, fix lock imbalance
    [SCSI] scsi_transport_fc: replace BUS_ID_SIZE by fixed count
    sd, sr: fix Driver 'sd' needs updating message
    scsi_transport_iscsi: return -EOVERFLOW for Too many iscsi targets
    fc_transport: Selective return value from BSG timeout function
    fc_transport: The softirq_done function registration for BSG request
    sym53c8xx: ratelimit parity errors
    explain the hidden scsi_wait_scan Kconfig variable
    ibmvfc: Fix endless PRLI loop in discovery
    ibmvfc: Process async events before command responses
    libfc: Add runtime debugging with debug_logging module parameter
    libfcoe: Add runtime debugging with module param debug_logging
    fcoe: Add runtime debug logging with module parameter debug_logging
    scsi_debug: Add support for physical block exponent and alignment
    cnic: add NETDEV_1000 and NETDEVICES to Kconfig select
    cnic: Fix __symbol_get() build error.
    Revert "[SCSI] cnic: fix error: implicit declaration of function ‘__symbol_get’"
    ipr: differentiate pci-x and pci-e based adapters
    ipr: add test for MSI interrupt support
    scsi_transport_spi: Blacklist Ultrium-3 tape for IU transfers
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
    asm-generic: add dummy pgprot_noncached()
    lib/checksum.c: fix endianess bug
    asm-generic: hook up new system calls
    asm-generic: list Arnd as asm-generic maintainer
    asm-generic: drop HARDIRQ_BITS definition from hardirq.h
    asm-generic: uaccess: fix up local access_ok() usage
    asm-generic: uaccess: add missing access_ok() check to strnlen_user()

    Linus Torvalds
     
  • handle_mm_fault() is now passing fault flags rather than write_access
    down to hugetlb_fault(), so better recognize that in hugetlb_fault(),
    and in hugetlb_no_page().

    Signed-off-by: Hugh Dickins
    Acked-by: Wu Fengguang
    Signed-off-by: Linus Torvalds

    Hugh Dickins
     

23 Jun, 2009

20 commits

  • Most architectures now provide a pgprot_noncached(), the
    remaining ones can simply use an dummy default implementation,
    except for cris and xtensa, which should override the
    default appropriately.

    Signed-off-by: Arnd Bergmann
    Cc: Jesper Nilsson
    Cc: Chris Zankel
    Cc: Magnus Damm

    Paul Mundt
     
  • Most hardware has limits on minimum and maximum image dimensions and also
    requirements about alignment. For example, image width must be even or a
    multiple of four. Some hardware has requirements that the total image size
    (width * height) be a multiple of some power of two.

    v4l_bound_align_image() will enforce min and max width and height, power of
    two alignment on width and height, and power of two alignment on total
    image size.

    It uses an efficient algorithm that will try to find the "closest" image
    size that meets the requirements.

    Signed-off-by: Trent Piepho
    Signed-off-by: Mauro Carvalho Chehab

    Trent Piepho
     
  • Add a new s_config core ops call: this is called with the irq and platform
    data to be used to initialize the subdev.

    Added new v4l2_i2c_new_subdev_cfg and v4l2_i2c_new_subdev_board calls
    that allows you to pass these new arguments.

    The existing v4l2_i2c_new_subdev functions were modified to also call
    s_config.

    In the future the existing v4l2_i2c_new_subdev functions will be replaced
    by a single v4l2_i2c_new_subdev function similar to v4l2_i2c_new_subdev_cfg
    but without the irq and platform_data arguments.

    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     
  • Make it very clear that this header should not be used for i2c drivers that
    do not need to be compiled for pre-2.6.26 kernels.

    As soon as the minimum supported kernel in the v4l-dvb repository becomes
    2.6.26 or up, then this header should be removed entirely.

    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     
  • Add an IR profile for the EVGA inDtube remote control (which is an NEC type
    remote)

    Signed-off-by: Devin Heitmueller
    Signed-off-by: Mauro Carvalho Chehab

    Devin Heitmueller
     
  • gspca_ov519: add support for the ov511 bridge

    Signed-off-by: Hans de Goede
    Signed-off-by: Mauro Carvalho Chehab

    Hans de Goede
     
  • This patch adds autobrightness (so that it can
    be turned off to make the already present brightness
    control work) and light frequency filtering controls.

    The lightfreq control needed 2 different entries
    in the ctrls array, as the number of options differs
    depending on the sensor. Always one of the 2 entires is
    disabled ofcourse.

    Signed-off-by: Hans de Goede
    Signed-off-by: Mauro Carvalho Chehab

    Hans de Goede
     
  • * git://git.infradead.org/~dwmw2/iommu-2.6.31:
    intel-iommu: Fix one last ia64 build problem in Pass Through Support
    VT-d: support the device IOTLB
    VT-d: cleanup iommu_flush_iotlb_psi and flush_unmaps
    VT-d: add device IOTLB invalidation support
    VT-d: parse ATSR in DMA Remapping Reporting Structure
    PCI: handle Virtual Function ATS enabling
    PCI: support the ATS capability
    intel-iommu: dmar_set_interrupt return error value
    intel-iommu: Tidy up iommu->gcmd handling
    intel-iommu: Fix tiny theoretical race in write-buffer flush.
    intel-iommu: Clean up handling of "caching mode" vs. IOTLB flushing.
    intel-iommu: Clean up handling of "caching mode" vs. context flushing.
    VT-d: fix invalid domain id for KVM context flush
    Fix !CONFIG_DMAR build failure introduced by Intel IOMMU Pass Through Support
    Intel IOMMU Pass Through Support

    Fix up trivial conflicts in drivers/pci/{intel-iommu.c,intr_remapping.c}

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
    firewire: new stack is no longer experimental
    firewire: net: better FIFO address range check and rcodes
    firewire: net: fix card driver reloading
    firewire: core: fix iso context shutdown on card removal
    firewire: core: fix DMA unmapping in iso buffer removal
    firewire: net: adjust net_device ops
    firewire: net: remove unused code
    firewire: net: allow for unordered unit discovery
    firewire: net: style changes
    firewire: net: add Kconfig item, rename driver
    firewire: add IPv4 support

    Linus Torvalds
     
  • The purpose of this patch is to improve the remote mount path lookup
    support for distributed filesystems such as the NFSv4 client.

    When given a mount command of the form "mount server:/foo/bar /mnt", the
    NFSv4 client is required to look up the filehandle for "server:/", and
    then look up each component of the remote mount path "foo/bar" in order
    to find the directory that is actually going to be mounted on /mnt.
    Following that remote mount path may involve following symlinks,
    crossing server-side mount points and even following referrals to
    filesystem volumes on other servers.

    Since the standard VFS path lookup code already supports walking paths
    that contain all these features (using in-kernel automounts for
    following referrals) we would like to be able to reuse that rather than
    duplicate the full path traversal functionality in the NFSv4 client code.

    This patch therefore defines a VFS helper function create_mnt_ns(), that
    sets up a temporary filesystem namespace and attaches a root filesystem to
    it. It exports the create_mnt_ns() and put_mnt_ns() function for use by
    filesystem modules.

    Signed-off-by: Trond Myklebust
    Signed-off-by: Linus Torvalds

    Trond Myklebust
     
  • In order to allow modules to use it without having to export vfsmount_lock.

    Signed-off-by: Trond Myklebust
    Signed-off-by: Linus Torvalds

    Trond Myklebust
     
  • SLAB uses get/put_online_cpus() which use a mutex which is itself only
    initialized when cpu_hotplug_init() is called. Currently we hang suring
    boot in SLAB due to doing that too late.

    Reported by James Bottomley and Sachin Sant (and possibly others).
    Debugged by Benjamin Herrenschmidt.

    This just removes the dynamic initialization of the data structures, and
    replaces it with a static one, avoiding this dependency entirely, and
    removing one unnecessary special initcall.

    Tested-by: Sachin Sant
    Tested-by: James Bottomley
    Tested-by: Benjamin Herrenschmidt
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * git://git.infradead.org/mtd-2.6: (63 commits)
    mtd: OneNAND: Allow setting of boundary information when built as module
    jffs2: leaking jffs2_summary in function jffs2_scan_medium
    mtd: nand: Fix memory leak on txx9ndfmc probe failure.
    mtd: orion_nand: use burst reads with double word accesses
    mtd/nand: s3c6400 support for s3c2410 driver
    [MTD] [NAND] S3C2410: Use DIV_ROUND_UP
    [MTD] [NAND] S3C2410: Deal with unaligned lengths in S3C2440 buffer read/write
    [MTD] [NAND] S3C2410: Allow the machine code to get the BBT table from NAND
    [MTD] [NAND] S3C2410: Added a kerneldoc for s3c2410_nand_set
    mtd: physmap_of: Add multiple regions and concatenation support
    mtd: nand: max_retries off by one in mxc_nand
    mtd: nand: s3c2410_nand_setrate(): use correct macros for 2412/2440
    mtd: onenand: add bbt_wait & unlock_all as replaceable for some platform
    mtd: Flex-OneNAND support
    mtd: nand: add OMAP2/OMAP3 NAND driver
    mtd: maps: Blackfin async: fix memory leaks in probe/remove funcs
    mtd: uclinux: mark local stuff static
    mtd: uclinux: do not allow to be built as a module
    mtd: uclinux: allow systems to override map addr/size
    mtd: blackfin NFC: fix hang when using NAND on BF527-EZKITs
    ...

    Linus Torvalds
     
  • In asm-generic/vmlinux.lds.h, name INIT_RAM_FS consistently, no matter the
    setting of CONFIG_BLK_DEV_INITRD. This corrects:

    commit ef53dae8658cf0e93d380983824a661067948d87
    Author: Sam Ravnborg
    Date: Sun Jun 7 20:46:37 2009 +0200
    Subject: Improve vmlinux.lds.h support for arch specific linker scripts

    Signed-off-by: David Howells
    Acked-by: Sam Ravnborg
    Signed-off-by: Linus Torvalds

    David Howells
     
  • * 'for-2.6.31' of git://fieldses.org/git/linux-nfsd: (60 commits)
    SUNRPC: Fix the TCP server's send buffer accounting
    nfsd41: Backchannel: minorversion support for the back channel
    nfsd41: Backchannel: cleanup nfs4.0 callback encode routines
    nfsd41: Remove ip address collision detection case
    nfsd: optimise the starting of zero threads when none are running.
    nfsd: don't take nfsd_mutex twice when setting number of threads.
    nfsd41: sanity check client drc maxreqs
    nfsd41: move channel attributes from nfsd4_session to a nfsd4_channel_attr struct
    NFS: kill off complicated macro 'PROC'
    sunrpc: potential memory leak in function rdma_read_xdr
    nfsd: minor nfsd_vfs_write cleanup
    nfsd: Pull write-gathering code out of nfsd_vfs_write
    nfsd: track last inode only in use_wgather case
    sunrpc: align cache_clean work's timer
    nfsd: Use write gathering only with NFSv2
    NFSv4: kill off complicated macro 'PROC'
    NFSv4: do exact check about attribute specified
    knfsd: remove unreported filehandle stats counters
    knfsd: fix reply cache memory corruption
    knfsd: reply cache cleanups
    ...

    Linus Torvalds
     
  • * 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (128 commits)
    nfs41: sunrpc: xprt_alloc_bc_request() should not use spin_lock_bh()
    nfs41: Move initialization of nfs4_opendata seq_res to nfs4_init_opendata_res
    nfs: remove unnecessary NFS_INO_INVALID_ACL checks
    NFS: More "sloppy" parsing problems
    NFS: Invalid mount option values should always fail, even with "sloppy"
    NFS: Remove unused XDR decoder functions
    NFS: Update MNT and MNT3 reply decoding functions
    NFS: add XDR decoder for mountd version 3 auth-flavor lists
    NFS: add new file handle decoders to in-kernel mountd client
    NFS: Add separate mountd status code decoders for each mountd version
    NFS: remove unused function in fs/nfs/mount_clnt.c
    NFS: Use xdr_stream-based XDR encoder for MNT's dirpath argument
    NFS: Clean up MNT program definitions
    lockd: Don't bother with RPC ping for NSM upcalls
    lockd: Update NSM state from SM_MON replies
    NFS: Fix false error return from nfs_callback_up() if ipv6.ko is not available
    NFS: Return error code from nfs_callback_up() to user space
    NFS: Do not display the setting of the "intr" mount option
    NFS: add support for splice writes
    nfs41: Backchannel: CB_SEQUENCE validation
    ...

    Linus Torvalds
     
  • * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (74 commits)
    PCI: make msi_free_irqs() to use msix_mask_irq() instead of open coded write
    PCI: Fix the NIU MSI-X problem in a better way
    PCI ASPM: remove get_root_port_link
    PCI ASPM: cleanup pcie_aspm_sanity_check
    PCI ASPM: remove has_switch field
    PCI ASPM: cleanup calc_Lx_latency
    PCI ASPM: cleanup pcie_aspm_get_cap_device
    PCI ASPM: cleanup clkpm checks
    PCI ASPM: cleanup __pcie_aspm_check_state_one
    PCI ASPM: cleanup initialization
    PCI ASPM: cleanup change input argument of aspm functions
    PCI ASPM: cleanup misc in struct pcie_link_state
    PCI ASPM: cleanup clkpm state in struct pcie_link_state
    PCI ASPM: cleanup latency field in struct pcie_link_state
    PCI ASPM: cleanup aspm state field in struct pcie_link_state
    PCI ASPM: fix typo in struct pcie_link_state
    PCI: drivers/pci/slot.c should depend on CONFIG_SYSFS
    PCI: remove redundant __msi_set_enable()
    PCI PM: consistently use type bool for wake enable variable
    x86/ACPI: Correct maximum allowed _CRS returned resources and warn if exceeded
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (43 commits)
    via-velocity: Fix velocity driver unmapping incorrect size.
    mlx4_en: Remove redundant refill code on RX
    mlx4_en: Removed redundant check on lso header size
    mlx4_en: Cancel port_up check in transmit function
    mlx4_en: using stop/start_all_queues
    mlx4_en: Removed redundant skb->len check
    mlx4_en: Counting all the dropped packets on the TX side
    usbnet cdc_subset: fix issues talking to PXA gadgets
    Net: qla3xxx, remove sleeping in atomic
    ipv4: fix NULL pointer + success return in route lookup path
    isdn: clean up documentation index
    cfg80211: validate station settings
    cfg80211: allow setting station parameters in mesh
    cfg80211: allow adding/deleting stations on mesh
    ath5k: fix beacon_int handling
    MAINTAINERS: Fix Atheros pattern paths
    ath9k: restore PS mode, before we put the chip into FULL SLEEP state.
    ath9k: wait for beacon frame along with CAB
    acer-wmi: fix rfkill conversion
    ath5k: avoid PCI FATAL interrupts by restoring RETRY_TIMEOUT disabling
    ...

    Linus Torvalds
     
  • Signed-off-by: Brian Swetland
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Robert Love
     
  • Add the wakeup enable register to the list of OMAP-specific UART
    registers. This is to support forthcoming OMAP PM enhancements which
    use the wakeup feature of the OMAP's 8250-based UART.

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

    Kevin Hilman
     

22 Jun, 2009

3 commits

  • This allows the callers to now pass down the full set of FAULT_FLAG_xyz
    flags to handle_mm_fault(). All callers have been (mechanically)
    converted to the new calling convention, there's almost certainly room
    for architectures to clean up their code and then add FAULT_FLAG_RETRY
    when that support is added.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • If a SCSI ULD driver sets blk_queue_prep_rq(), it should clean it
    up itself on remove(), and not from the bus callbacks. This
    removes the need to hook into bus->remove(), which should not
    be used at the same time as driver->remove().

    [jejb: fix sdkp initialisation problem due to mismerge]
    Signed-off-by: Hannes Reinecke
    Signed-off-by: Kay Sievers
    Signed-off-by: James Bottomley

    Hannes Reinecke
     
  • This patch adds the /sys/module/libfc/parameters/debug_logging
    file to sysfs as a module parameter. It accepts an integer
    bitmask for logging. Currently it supports:

    bit
    LSB 0 = general libfc debugging
    1 = lport debugging
    2 = disc debugging
    3 = rport debugging
    4 = fcp debugging
    5 = EM debugging
    6 = exch/seq debugging
    7 = scsi logging (mostly error handling)

    the other bits are not used at this time.

    The patch converts all of the libfc source files to use
    these new macros and removes the old FC_DBG macro.

    Signed-off-by: Robert Love
    Signed-off-by: James Bottomley

    Robert Love
     

21 Jun, 2009

7 commits

  • If we are sending or receiving data for the task successfully do
    not run the scsi eh, because we know the task is making progress.

    Signed-off-by: Mike Christie
    Signed-off-by: James Bottomley

    Mike Christie
     
  • …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, irq.h: Fix kernel-doc warnings
    genirq: fix comment to say IRQ_WAKE_THREAD

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

    * 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (49 commits)
    perfcounter: Handle some IO return values
    perf_counter: Push perf_sample_data through the swcounter code
    perf_counter tools: Define and use our own u64, s64 etc. definitions
    perf_counter: Close race in perf_lock_task_context()
    perf_counter, x86: Improve interactions with fast-gup
    perf_counter: Simplify and fix task migration counting
    perf_counter tools: Add a data file header
    perf_counter: Update userspace callchain sampling uses
    perf_counter: Make callchain samples extensible
    perf report: Filter to parent set by default
    perf_counter tools: Handle lost events
    perf_counter: Add event overlow handling
    fs: Provide empty .set_page_dirty() aop for anon inodes
    perf_counter: tools: Makefile tweaks for 64-bit powerpc
    perf_counter: powerpc: Add processor back-end for MPC7450 family
    perf_counter: powerpc: Make powerpc perf_counter code safe for 32-bit kernels
    perf_counter: powerpc: Change how processor-specific back-ends get selected
    perf_counter: powerpc: Use unsigned long for register and constraint values
    perf_counter: powerpc: Enable use of software counters on 32-bit powerpc
    perf_counter tools: Add and use isprint()
    ...

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

    * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)
    tracing/urgent: warn in case of ftrace_start_up inbalance
    tracing/urgent: fix unbalanced ftrace_start_up
    function-graph: add stack frame test
    function-graph: disable when both x86_32 and optimize for size are configured
    ring-buffer: have benchmark test print to trace buffer
    ring-buffer: do not grab locks in nmi
    ring-buffer: add locks around rb_per_cpu_empty
    ring-buffer: check for less than two in size allocation
    ring-buffer: remove useless compile check for buffer_page size
    ring-buffer: remove useless warn on check
    ring-buffer: use BUF_PAGE_HDR_SIZE in calculating index
    tracing: update sample event documentation
    tracing/filters: fix race between filter setting and module unload
    tracing/filters: free filter_string in destroy_preds()
    ring-buffer: use commit counters for commit pointer accounting
    ring-buffer: remove unused variable
    ring-buffer: have benchmark test handle discarded events
    ring-buffer: prevent adding write in discarded area
    tracing/filters: strloc should be unsigned short
    tracing/filters: operand can be negative
    ...

    Fix up kmemcheck-induced conflict in kernel/trace/ring_buffer.c manually

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (35 commits)
    Input: add driver for Synaptics I2C touchpad
    Input: synaptics - add support for reporting x/y resolution
    Input: ALPS - handle touchpoints buttons correctly
    Input: gpio-keys - change timer to workqueue
    Input: ads7846 - pin change interrupt support
    Input: add support for touchscreen on W90P910 ARM platform
    Input: appletouch - improve finger detection
    Input: wacom - clear Intuos4 wheel data when finger leaves proximity
    Input: ucb1400 - move static function from header into core
    Input: add driver for EETI touchpanels
    Input: ads7846 - more detailed model name in sysfs
    Input: ads7846 - support swapping x and y axes
    Input: ati_remote2 - use non-atomic bitops
    Input: introduce lm8323 keypad driver
    Input: psmouse - ESD workaround fix for OLPC XO touchpad
    Input: tsc2007 - make sure platform provides get_pendown_state()
    Input: uinput - flush all pending ff effects before destroying device
    Input: simplify name handling for certain input handles
    Input: serio - do not use deprecated dev.power.power_state
    Input: wacom - add support for Intuos4 tablets
    ...

    Linus Torvalds
     
  • * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (24 commits)
    agp/intel: Make intel_i965_mask_memory use dma_addr_t for physical addresses
    agp: add user mapping support to ATI AGP bridge.
    drm/i915: enable GEM on PAE.
    drm/radeon: fix unused variables warning
    agp: switch AGP to use page array instead of unsigned long array
    agpgart: detected ALi M???? chipset with M1621
    drm/radeon: command stream checker for r3xx-r5xx hardware
    drm/radeon: Fully initialize LVDS info also when we can't get it from the ROM.
    radeon: Fix CP byte order on big endian architectures with KMS.
    agp/uninorth: Handle user memory types.
    drm/ttm: Add some powerpc cache flush code.
    radeon: Enable modesetting on non-x86.
    drm/radeon: Respect AGP cant_use_aperture flag.
    drm: EDID endianness fixes.
    drm/radeon: this VRAM vs aperture test is wrong, just remove it.
    drm/ttm: fix an error path to exit function correctly
    drm: Apply "Memory fragmentation from lost alignment blocks"
    ttm: Return -ERESTART when a signal interrupts bo eviction.
    drm: Remove memory debugging infrastructure.
    drm/i915: Clear fence register on tiling stride change.
    ...

    Linus Torvalds
     
  • * 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (34 commits)
    ide-cd: prevent null pointer deref via cdrom_newpc_intr
    ide: BUG() on unknown requests
    ide: filter out invalid DMA xfer mode changes in HDIO_DRIVE_CMD ioctl handler
    ide: do not access ide_drive_t 'drive_data' field directly
    sl82c105: implement test_irq() method
    siimage: implement test_irq() method
    pdc202xx_old: implement test_irq() method (take 2)
    cmd64x: implement test_irq() method
    cmd640: implement test_irq() method
    ide: move ack_intr() method into 'struct ide_port_ops' (take 2)
    ide: move IRQ clearing from ack_intr() method to clear_irq() method (take 2)
    siimage: use ide_dma_test_irq() (take 2)
    cmd64x: implement clear_irq() method (take 2)
    ide: call clear_irq() method in ide_timer_expiry()
    sgiioc4: coding style cleanup
    ide: don't enable IORDY at a probe time
    ide: IORDY handling fixes
    ata: add ata_id_pio_need_iordy() helper (v2)
    ide-tape: fix build issue
    ide: unify interrupt reason checking
    ...

    Linus Torvalds
     

20 Jun, 2009

2 commits