* [README] net --> net-next merge
@ 2012-05-08 3:41 David Miller
2012-05-08 9:02 ` Jeff Kirsher
0 siblings, 1 reply; 2+ messages in thread
From: David Miller @ 2012-05-08 3:41 UTC (permalink / raw)
To: netdev; +Cc: sfr, linville, jeffrey.t.kirsher
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [README] net --> net-next merge
2012-05-08 3:41 [README] net --> net-next merge David Miller
@ 2012-05-08 9:02 ` Jeff Kirsher
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Kirsher @ 2012-05-08 9:02 UTC (permalink / raw)
To: David Miller; +Cc: netdev, sfr, linville
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-08 9:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-08 3:41 [README] net --> net-next merge David Miller
2012-05-08 9:02 ` Jeff Kirsher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.