From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Cong Wang <amwang@redhat.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Haiyang Zhang <haiyangz@microsoft.com>,
"K. Y. Srinivasan" <kys@microsoft.com>, Greg KH <greg@kroah.com>
Subject: linux-next: manual merge of the kmap_atomic tree with the staging tree
Date: Fri, 6 Jan 2012 18:40:55 +1100 [thread overview]
Message-ID: <20120106184055.3669727def69e424cd98690d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
Hi Cong,
Today's linux-next merge of the kmap_atomic tree got conflicts in
drivers/net/hyperv/netvsc_drv.c and drivers/net/hyperv/rndis_filter.c
between commit 453263421f88 ("net/hyperv: Remove unnecessary kmap_atomic
in netvsc driver") from the staging tree and commit e91cd643d15d ("hv:
remove the second argument of k[un]map_atomic()") from the kmap_atomic
tree.
The former removed the code modified by the latter, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-01-06 7:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-06 7:40 Stephen Rothwell [this message]
2012-01-06 8:17 ` Cong Wang
2012-01-06 15:47 ` Haiyang Zhang
2012-02-13 5:08 Stephen Rothwell
2012-02-13 9:02 ` Cong Wang
2012-02-13 5:15 Stephen Rothwell
2012-02-13 9:01 ` Cong Wang
2012-02-13 5:20 Stephen Rothwell
2012-02-13 9:00 ` Cong Wang
2012-02-13 5:27 Stephen Rothwell
2012-02-13 9:00 ` Cong Wang
[not found] <20120301170731.e14fb63e606a8e67b0cb919a@canb.auug.org.au>
2012-03-02 5:51 ` Cong Wang
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=20120106184055.3669727def69e424cd98690d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=amwang@redhat.com \
--cc=greg@kroah.com \
--cc=haiyangz@microsoft.com \
--cc=kys@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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
all inboxes | Powered by JetHome®