From mboxrd@z Thu Jan  1 00:00:00 1970
From: Avi Kivity <avi@redhat.com>
Subject: Re: [COMMIT master] Merge branch 'master' of	ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
 into next
Date: Sun, 06 Jun 2010 19:13:05 +0300
Message-ID: <4C0BC911.6020808@redhat.com>
References: <20100606160946.53D62250AEB@cleopatra.tlv.redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: KVM list <kvm@vger.kernel.org>
To: Alexander Graf <agraf@suse.de>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:10697 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S932198Ab0FFQNM (ORCPT <rfc822;kvm@vger.kernel.org>);
	Sun, 6 Jun 2010 12:13:12 -0400
In-Reply-To: <20100606160946.53D62250AEB@cleopatra.tlv.redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On 06/06/2010 07:09 PM, Avi Kivity wrote:
> From: Avi Kivity<avi@redhat.com>
>
> * 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (1443 commits)
>    Linux 2.6.35-rc2
>    drm/i915: Move non-phys cursors into the GTT
>    ext4: Fix remaining racy updates of EXT4_I(inode)->i_flags
>    module: fix bne2 "gave up waiting for init of module libcrc32c"
>    module: verify_export_symbols under the lock
>    module: move find_module check to end
>    module: make locking more fine-grained.
>    module: Make module sysfs functions private.
>    module: move sysfs exposure to end of load_module
>    module: fix kdb's illicit use of struct module_use.
>    module: Make the 'usage' lists be two-way
>    X25: remove duplicated #include
>    tcp: use correct net ns in cookie_v4_check()
>    rps: tcp: fix rps_sock_flow_table table updates
>    ppp_generic: fix multilink fragment sizes
>    syncookies: remove Kconfig text line about disabled-by-default
>    ixgbe: only check pfc bits in hang logic if pfc is enabled
>    net: check for refcount if pop a stacked dst_entry
>    omap: remove BUG_ON for disabled interrupts
>    vmscan: fix do_try_to_free_pages() return value when priority==0 reclaim failure
>    ...
>
> Conflicts:
> 	arch/powerpc/kernel/ppc_ksyms.c
>    

Alex, can you verify that I merged this correctly (dropping the export)?

-- 
error compiling committee.c: too many arguments to function