From: Avi Kivity <avi@redhat.com>
To: Alexander Graf <agraf@suse.de>
Cc: KVM list <kvm@vger.kernel.org>
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 [thread overview]
Message-ID: <4C0BC911.6020808@redhat.com> (raw)
In-Reply-To: <20100606160946.53D62250AEB@cleopatra.tlv.redhat.com>
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
next parent reply other threads:[~2010-06-06 16:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20100606160946.53D62250AEB@cleopatra.tlv.redhat.com>
2010-06-06 16:13 ` Avi Kivity [this message]
2010-06-06 21:48 ` [COMMIT master] Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next Alexander Graf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C0BC911.6020808@redhat.com \
--to=avi@redhat.com \
--cc=agraf@suse.de \
--cc=kvm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox