1. 26 10月, 2011 15 次提交
  2. 25 10月, 2011 25 次提交
    • L
      Merge branch 'for-linus' of git://github.com/gregungerer/m68knommu · 7670c701
      Linus Torvalds 提交于
      * 'for-linus' of git://github.com/gregungerer/m68knommu:
        m68k: drop unused Kconfig symbols
        m68k: drop unused Kconfig symbols
        m68knommu: create common externs for _ram* vars
        m68knommu: remove extern declarations of memory_start/memory_end from mm/init
        m68knommu: use generic section names in mm/init code
        m68knommu: use generic section names in setup code
        m68k: merge the mmu and non-mmu traps.c files
        m68k: move hardware vector setting from traps.c to its own file
        m68k: merge mmu and non-mmu include/asm/entry.h files
        m68k: merge the mmu and non-mmu kernel/Makefiles
        m68k: merge mmu and non-mmu arch Makefiles
        m68k: reorganize Kconfig options to improve mmu/non-mmu selections
        m68knommu: fix problems with SPI/GPIO on ColdFire 520x
        m68k: fix memcpy to unmatched/unaligned source and dest on 68000
      7670c701
    • E
      ehea: fix skb_frag_size typo · 0110bba5
      Eric Dumazet 提交于
      Commit 9e903e08 ("net: add skb frag size accessors") introduced a
      typo in ehea driver.
      Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0110bba5
    • L
      Merge branch 'nfs-for-3.2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · ef78cc75
      Linus Torvalds 提交于
      * 'nfs-for-3.2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (26 commits)
        Check validity of cl_rpcclient in nfs_server_list_show
        NFS: Get rid of the nfs_rdata_mempool
        NFS: Don't rely on PageError in nfs_readpage_release_partial
        NFS: Get rid of unnecessary calls to ClearPageError() in read code
        NFS: Get rid of nfs_restart_rpc()
        NFS: Get rid of the unused nfs_write_data->flags field
        NFS: Get rid of the unused nfs_read_data->flags field
        NFSv4: Translate NFS4ERR_BADNAME into ENOENT when applied to a lookup
        NFS: Remove the unused "lookupfh()" version of nfs4_proc_lookup()
        NFS: Use the inode->i_version to cache NFSv4 change attribute information
        SUNRPC: Remove unnecessary export of rpc_sockaddr2uaddr
        SUNRPC: Fix rpc_sockaddr2uaddr
        nfs/super.c: local functions should be static
        pnfsblock: fix writeback deadlock
        pnfsblock: fix NULL pointer dereference
        pnfs: recoalesce when ld read pagelist fails
        pnfs: recoalesce when ld write pagelist fails
        pnfs: make _set_lo_fail generic
        pnfsblock: add missing rpc_put_mount and path_put
        SUNRPC/NFS: make rpc pipe upcall generic
        ...
      ef78cc75
    • L
      Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux · 1442d167
      Linus Torvalds 提交于
      * 'for-3.2' of git://linux-nfs.org/~bfields/linux: (103 commits)
        nfs41: implement DESTROY_CLIENTID operation
        nfsd4: typo logical vs bitwise negate for want_mask
        nfsd4: allow NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL | NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED
        nfsd4: seq->status_flags may be used unitialized
        nfsd41: use SEQ4_STATUS_BACKCHANNEL_FAULT when cb_sequence is invalid
        nfsd4: implement new 4.1 open reclaim types
        nfsd4: remove unneeded CLAIM_DELEGATE_CUR workaround
        nfsd4: warn on open failure after create
        nfsd4: preallocate open stateid in process_open1()
        nfsd4: do idr preallocation with stateid allocation
        nfsd4: preallocate nfs4_file in process_open1()
        nfsd4: clean up open owners on OPEN failure
        nfsd4: simplify process_open1 logic
        nfsd4: make is_open_owner boolean
        nfsd4: centralize renew_client() calls
        nfsd4: typo logical vs bitwise negate
        nfs: fix bug about IPv6 address scope checking
        nfsd4: more robust ignoring of WANT bits in OPEN
        nfsd4: move name-length checks to xdr
        nfsd4: move access/deny validity checks to xdr code
        ...
      1442d167
    • L
      Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 7e0bb71e
      Linus Torvalds 提交于
      * 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (63 commits)
        PM / Clocks: Remove redundant NULL checks before kfree()
        PM / Documentation: Update docs about suspend and CPU hotplug
        ACPI / PM: Add Sony VGN-FW21E to nonvs blacklist.
        ARM: mach-shmobile: sh7372 A4R support (v4)
        ARM: mach-shmobile: sh7372 A3SP support (v4)
        PM / Sleep: Mark devices involved in wakeup signaling during suspend
        PM / Hibernate: Improve performance of LZO/plain hibernation, checksum image
        PM / Hibernate: Do not initialize static and extern variables to 0
        PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too
        PM / Hibernate: Add resumedelay kernel param in addition to resumewait
        MAINTAINERS: Update linux-pm list address
        PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs
        PM / ACPI: Blacklist Sony Vaio known to require acpi_sleep=nonvs
        PM / Hibernate: Add resumewait param to support MMC-like devices as resume file
        PM / Hibernate: Fix typo in a kerneldoc comment
        PM / Hibernate: Freeze kernel threads after preallocating memory
        PM: Update the policy on default wakeup settings
        PM / VT: Cleanup #if defined uglyness and fix compile error
        PM / Suspend: Off by one in pm_suspend()
        PM / Hibernate: Include storage keys in hibernation image on s390
        ...
      7e0bb71e
    • E
      sysfs: Remove support for tagged directories with untagged members (again) · b9e2780d
      Eric W. Biederman 提交于
      In commit 8a9ea323 ("Merge git://.../davem/net-next") where my sysfs
      changes from the net tree merged with the sysfs rbtree changes from
      Mickulas Patocka the conflict resolution failed to preserve the
      simplified property that was the point of my changes.
      
      That is sysfs_find_dirent can now say something is a match if and only
      s_name and s_ns match what we are looking for, and sysfs_readdir can
      simply return all of the directory entries where s_ns matches the
      directory that we should be returning.
      
      Now that we are back to exact matches we can tweak sysfs_find_dirent and
      the name rb_tree to order sysfs_dirents by s_ns s_name and remove the
      second loop in sysfs_find_dirent.  However that change seems a bit much
      for a conflict resolution so it can come later.
      Signed-off-by: NEric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b9e2780d
    • L
      Merge branch 'for-next' of git://git.linaro.org/people/triad/linux-pinctrl · c9d6329c
      Linus Torvalds 提交于
      * 'for-next' of git://git.linaro.org/people/triad/linux-pinctrl:
        pinctrl/sirf: fix sirfsoc_get_group_pins prototype
        pinctrl: Don't copy function name when requesting a pin
        pinctrl: Don't copy pin names when registering them
        pinctrl: Remove unsafe __refdata
        pinctrl: get_group_pins() const fixes
        pinctrl: add a driver for the CSR SiRFprimaII pinmux
        pinctrl: add a driver for the U300 pinmux
        drivers: create a pin control subsystem
      c9d6329c
    • L
      Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regmap · 4e7e2a20
      Linus Torvalds 提交于
      * 'for-linus' of git://opensource.wolfsonmicro.com/regmap: (62 commits)
        mfd: Enable rbtree cache for wm831x devices
        regmap: Support some block operations on cached devices
        regmap: Allow caches for devices with no defaults
        regmap: Ensure rbtree syncs registers set to zero properly
        regmap: Allow rbtree to cache zero default values
        regmap: Warn on raw I/O as well as bulk reads that bypass cache
        regmap: Return a sensible error code if we fail to read the cache
        regmap: Use bsearch() to search the register defaults
        regmap: Fix doc comment
        regmap: Optimize the lookup path to use binary search
        regmap: Ensure we scream if we enable cache bypass/only at the same time
        regmap: Implement regcache_cache_bypass helper function
        regmap: Save/restore the bypass state upon syncing
        regmap: Lock the sync path, ensure we use the lockless _regmap_write()
        regmap: Fix apostrophe usage
        regmap: Make _regmap_write() global
        regmap: Fix lock used for regcache_cache_only()
        regmap: Grab the lock in regcache_cache_only()
        regmap: Modify map->cache_bypass directly
        regmap: Fix regcache_sync generic implementation
        ...
      4e7e2a20
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 8a9ea323
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
        dp83640: free packet queues on remove
        dp83640: use proper function to free transmit time stamping packets
        ipv6: Do not use routes from locally generated RAs
        |PATCH net-next] tg3: add tx_dropped counter
        be2net: don't create multiple RX/TX rings in multi channel mode
        be2net: don't create multiple TXQs in BE2
        be2net: refactor VF setup/teardown code into be_vf_setup/clear()
        be2net: add vlan/rx-mode/flow-control config to be_setup()
        net_sched: cls_flow: use skb_header_pointer()
        ipv4: avoid useless call of the function check_peer_pmtu
        TCP: remove TCP_DEBUG
        net: Fix driver name for mdio-gpio.c
        ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
        rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
        ipv4: fix ipsec forward performance regression
        jme: fix irq storm after suspend/resume
        route: fix ICMP redirect validation
        net: hold sock reference while processing tx timestamps
        tcp: md5: add more const attributes
        Add ethtool -g support to virtio_net
        ...
      
      Fix up conflicts in:
       - drivers/net/Kconfig:
      	The split-up generated a trivial conflict with removal of a
      	stale reference to Documentation/networking/net-modules.txt.
      	Remove it from the new location instead.
       - fs/sysfs/dir.c:
      	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
      	with Eric Biederman's changes for tagged directories.
      8a9ea323
    • L
      Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 1be025d3
      Linus Torvalds 提交于
      * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (260 commits)
        usb: renesas_usbhs: fixup inconsistent return from usbhs_pkt_push()
        usb/isp1760: Allow to optionally trigger low-level chip reset via GPIOLIB.
        USB: gadget: midi: memory leak in f_midi_bind_config()
        USB: gadget: midi: fix range check in f_midi_out_open()
        QE/FHCI: fixed the CONTROL bug
        usb: renesas_usbhs: tidyup for smatch warnings
        USB: Fix USB Kconfig dependency problem on 85xx/QoirQ platforms
        EHCI: workaround for MosChip controller bug
        usb: gadget: file_storage: fix race on unloading
        USB: ftdi_sio.c: Use ftdi async_icount structure for TIOCMIWAIT, as in other drivers
        USB: ftdi_sio.c:Fill MSR fields of the ftdi async_icount structure
        USB: ftdi_sio.c: Fill LSR fields of the ftdi async_icount structure
        USB: ftdi_sio.c:Fill TX field of the ftdi async_icount structure
        USB: ftdi_sio.c: Fill the RX field of the ftdi async_icount structure
        USB: ftdi_sio.c: Basic icount infrastructure for ftdi_sio
        usb/isp1760: Let OF bindings depend on general CONFIG_OF instead of PPC_OF .
        USB: ftdi_sio: Support TI/Luminary Micro Stellaris BD-ICDI Board
        USB: Fix runtime wakeup on OHCI
        xHCI/USB: Make xHCI driver have a BOS descriptor.
        usb: gadget: add new usb gadget for ACM and mass storage
        ...
      1be025d3
    • L
      Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 2d03423b
      Linus Torvalds 提交于
      * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (38 commits)
        mm: memory hotplug: Check if pages are correctly reserved on a per-section basis
        Revert "memory hotplug: Correct page reservation checking"
        Update email address for stable patch submission
        dynamic_debug: fix undefined reference to `__netdev_printk'
        dynamic_debug: use a single printk() to emit messages
        dynamic_debug: remove num_enabled accounting
        dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
        uio: Support physical addresses >32 bits on 32-bit systems
        sysfs: add unsigned long cast to prevent compile warning
        drivers: base: print rejected matches with DEBUG_DRIVER
        memory hotplug: Correct page reservation checking
        memory hotplug: Refuse to add unaligned memory regions
        remove the messy code file Documentation/zh_CN/SubmitChecklist
        ARM: mxc: convert device creation to use platform_device_register_full
        new helper to create platform devices with dma mask
        docs/driver-model: Update device class docs
        docs/driver-model: Document device.groups
        kobj_uevent: Ignore if some listeners cannot handle message
        dynamic_debug: make netif_dbg() call __netdev_printk()
        dynamic_debug: make netdev_dbg() call __netdev_printk()
        ...
      2d03423b
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 59e52534
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
        MAINTAINERS: linux-m32r is moderated for non-subscribers
        linux@lists.openrisc.net is moderated for non-subscribers
        Drop default from "DM365 codec select" choice
        parisc: Kconfig: cleanup Kernel page size default
        Kconfig: remove redundant CONFIG_ prefix on two symbols
        cris: remove arch/cris/arch-v32/lib/nand_init.S
        microblaze: add missing CONFIG_ prefixes
        h8300: drop puzzling Kconfig dependencies
        MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
        tty: drop superfluous dependency in Kconfig
        ARM: mxc: fix Kconfig typo 'i.MX51'
        Fix file references in Kconfig files
        aic7xxx: fix Kconfig references to READMEs
        Fix file references in drivers/ide/
        thinkpad_acpi: Fix printk typo 'bluestooth'
        bcmring: drop commented out line in Kconfig
        btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
        doc: raw1394: Trivial typo fix
        CIFS: Don't free volume_info->UNC until we are entirely done with it.
        treewide: Correct spelling of successfully in comments
        ...
      59e52534
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm · 73692d9b
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
        apm-emulation: use wait_event_freezable() instead of freezer_[do_not_]count()
      73692d9b
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 31dced41
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (61 commits)
        HID: hid-magicmouse: Magic Trackpad has 1 button, not 2
        HID: Add device IDs for more SJOY adapters
        HID: primax: remove spurious dependency
        HID: support primax keyboards violating USB HID spec
        HID: usbhid: cancel timer for retry synchronously
        HID: wacom: Set input bits before registration
        HID: consolidate MacbookAir 4,1 mappings
        HID: MacbookAir4,1 and MacbookAir4,2 need entry in hid_mouse_ignore_list[]
        HID: Add support MacbookAir 4,1 keyboard
        HID: hidraw: open count should not increase if error
        HID: hiddev: potential info leak in hiddev_ioctl()
        HID: multitouch: decide if hid-multitouch needs to handle mt devices
        HID: add autodetection of multitouch devices
        HID: "hid-logitech" driver with Logitech Driving Force GT
        HID: hid-logitech-dj: fix off by one
        HID: hidraw: protect hidraw_disconnect() better
        HID: hid-multitouch: add support for the IDEACOM 6650 chip
        HID: Add full support for Logitech Unifying receivers
        HID: hidraw: free list for all error in hidraw_open
        HID: roccat: Kone now reports external profile changes via roccat device
        ...
      31dced41
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 7c1953dd
      Linus Torvalds 提交于
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (62 commits)
        target: Fix compile warning w/ missing module.h include
        target: Remove legacy se_task->task_timer and associated logic
        target: Fix incorrect transport_sent usage
        target: re-use the command S/G list for single-task commands
        target: Fix BIDI t_task_cdb handling in transport_generic_new_cmd
        target: remove transport_allocate_tasks
        target: merge transport_new_cmd_obj into transport_generic_new_cmd
        target: remove the task_sg_bidi field se_task and pSCSI BIDI support
        target: transport_subsystem_check_init cleanups
        target: use a workqueue for I/O completions
        target: remove unused TRANSPORT_ states
        target: remove TRANSPORT_DEFERRED_CMD state
        target: remove the TRANSPORT_REMOVE state
        target: move depth_left manipulation out of transport_generic_request_failure
        target: stop task timers earlier
        target: remove TF_TIMER_STOP
        target: factor some duplicate code for stopping a task
        target: fix list walking in transport_free_dev_tasks
        target: use transport_cmd_check_stop_to_fabric consistently
        target: do not pass the queue object to transport_remove_cmd_from_queue
        ...
      7c1953dd
    • J
      pinctrl/sirf: fix sirfsoc_get_group_pins prototype · ad7761ab
      Jean-Christophe PLAGNIOL-VILLARD 提交于
      fix sirfsoc_get_group_pins prototype introduced in 7e570f97, we
      missed to de-constify a pointer.
      Signed-off-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
      Acked-by: NStephen Warren <swarren@nvidia.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      ad7761ab
    • L
      Merge branch 'for-linus' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · 1bc67188
      Linus Torvalds 提交于
      * 'for-linus' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (81 commits)
        ARM: 7133/1: SMP: fix per cpu timer setup before the cpu is marked online
        ARM: 7129/1: Add __arm_ioremap_exec for mapping external memory as MT_MEMORY
        ARM: 7136/1: pl330: Fix a race condition
        ARM: smp: fix clipping of number of CPUs
        ARM: 7137/1: Fix error upon adding LL debug
        ARM: Add a few machine types to mach-types
        ARM: 7130/1: dev_archdata: add private iommu extension
        ARM: 7125/1: Add unwinding annotations for 64bit division functions
        ARM: 7120/1: remove bashism in check for multiple zreladdrs
        ARM: 7118/1: rename temp variable in read*_relaxed()
        ARM: 6217/4: mach-realview: expose PB1176 ROM using physmap and map_rom
        ARM: 7098/1: kdump: copy kernel relocation code at the kexec prepare stage
        ARM: 7062/1: cache: detect PIPT I-cache using CTR
        ARM: platform fixups: remove mdesc argument to fixup function
        ARM: 7017/1: Use generic BUG() handler
        ARM: 7102/1: mach-integrator: update defconfig
        ARM: 7087/2: mach-integrator: get timer frequency from clock
        ARM: 7086/2: mach-integrator: modernize clock event registration
        ARM: 7085/2: mach-integrator: clockevent supports oneshot mode
        ARM: 7084/1: mach-integrator: retire some timer macros
        ...
      1bc67188
    • J
      Merge branch 'upstream' into for-linus · b3aec7b6
      Jiri Kosina 提交于
      Conflicts:
      	drivers/hid/hid-core.c
      	drivers/hid/hid-ids.h
      b3aec7b6
    • J
      Merge branch 'upstream-fixes' into for-linus · f6f12427
      Jiri Kosina 提交于
      Conflicts:
      	drivers/hid/hid-wacom.c
      f6f12427
    • J
    • L
      Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-security · 36b8d186
      Linus Torvalds 提交于
      * 'next' of git://selinuxproject.org/~jmorris/linux-security: (95 commits)
        TOMOYO: Fix incomplete read after seek.
        Smack: allow to access /smack/access as normal user
        TOMOYO: Fix unused kernel config option.
        Smack: fix: invalid length set for the result of /smack/access
        Smack: compilation fix
        Smack: fix for /smack/access output, use string instead of byte
        Smack: domain transition protections (v3)
        Smack: Provide information for UDS getsockopt(SO_PEERCRED)
        Smack: Clean up comments
        Smack: Repair processing of fcntl
        Smack: Rule list lookup performance
        Smack: check permissions from user space (v2)
        TOMOYO: Fix quota and garbage collector.
        TOMOYO: Remove redundant tasklist_lock.
        TOMOYO: Fix domain transition failure warning.
        TOMOYO: Remove tomoyo_policy_memory_lock spinlock.
        TOMOYO: Simplify garbage collector.
        TOMOYO: Fix make namespacecheck warnings.
        target: check hex2bin result
        encrypted-keys: check hex2bin result
        ...
      36b8d186
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · cd85b557
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Finally remove leftover markers sections
        m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC
        m68k/mac: Fix compiler warning in via_read_time()
        zorro: Fix four checkpatch warnings
      cd85b557
    • R
      Merge branch 'misc' into for-linus · bdf4e948
      Russell King 提交于
      Conflicts:
      	arch/arm/mach-integrator/integrator_ap.c
      bdf4e948
    • L
      Merge branches 'stable/drivers-3.2', 'stable/drivers.bugfixes-3.2' and... · 04a87524
      Linus Torvalds 提交于
      Merge branches 'stable/drivers-3.2', 'stable/drivers.bugfixes-3.2' and 'stable/pci.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/drivers-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xenbus: don't rely on xen_initial_domain to detect local xenstore
        xenbus: Fix loopback event channel assuming domain 0
        xen/pv-on-hvm:kexec: Fix implicit declaration of function 'xen_hvm_domain'
        xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel
        xen/pv-on-hvm kexec: update xs_wire.h:xsd_sockmsg_type from xen-unstable
        xen/pv-on-hvm kexec+kdump: reset PV devices in kexec or crash kernel
        xen/pv-on-hvm kexec: rebind virqs to existing eventchannel ports
        xen/pv-on-hvm kexec: prevent crash in xenwatch_thread() when stale watch events arrive
      
      * 'stable/drivers.bugfixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/pciback: Check if the device is found instead of blindly assuming so.
        xen/pciback: Do not dereference psdev during printk when it is NULL.
        xen: remove XEN_PLATFORM_PCI config option
        xen: XEN_PVHVM depends on PCI
        xen/pciback: double lock typo
        xen/pciback: use mutex rather than spinlock in vpci backend
        xen/pciback: Use mutexes when working with Xenbus state transitions.
        xen/pciback: miscellaneous adjustments
        xen/pciback: use mutex rather than spinlock in passthrough backend
        xen/pciback: use resource_size()
      
      * 'stable/pci.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/pci: support multi-segment systems
        xen-swiotlb: When doing coherent alloc/dealloc check before swizzling the MFNs.
        xen/pci: make bus notifier handler return sane values
        xen-swiotlb: fix printk and panic args
        xen-swiotlb: Fix wrong panic.
        xen-swiotlb: Retry up three times to allocate Xen-SWIOTLB
        xen-pcifront: Update warning comment to use 'e820_host' option.
      04a87524
    • R
      Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0',... · 06afb1a0
      Russell King 提交于
      Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v', 'pgt' (early part) and 'smp' into for-linus
      06afb1a0