From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, sfr@canb.auug.org.au, linville@tuxdriver.com
Subject: Re: [README] net --> net-next merge
Date: Tue, 08 May 2012 02:02:40 -0700 [thread overview]
Message-ID: <1336467760.2442.4.camel@jtkirshe-mobl> (raw)
In-Reply-To: <20120507.234113.2269441747611427613.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 765 bytes --]
On Mon, 2012-05-07 at 23:41 -0400, David Miller wrote:
> I just merged net into net-next, there were two major conflicts.
>
> 1) The known iwlwifi conflict due to the skb->truesize bug fix in
> 'net'.
>
> I used the conflict resolution posted by John and later by Stephen
> when he resolved it for -next.
>
> John, please double-check my work.
>
> 2) drivers/net/ethernet/intel/e1000e/param.c got a conflict in
> the code which validates adapter->itr settings.
>
> The net-next side looked more sophisticated so that's what I
> used.
>
> Jeff, please double-check and send me fixup patches if necessary.
>
> Thanks.
Yeah, I will need to send a fixup patch. I have something for you later
today. Thanks Dave!
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2012-05-08 9:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-08 3:41 [README] net --> net-next merge David Miller
2012-05-08 9:02 ` Jeff Kirsher [this message]
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=1336467760.2442.4.camel@jtkirshe-mobl \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).