Re: [README] net --> net-next merge
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!
Description: This is a digitally signed message part
[Linux Kernel Discussion] [Ethernet Bridging] [Linux Wireless Networking] [Linux Bluetooth Networking] [Linux Networking Users] [VLAN] [Git] [IETF Annouce] [Linux Assembly] [Security] [Bugtraq] [Photo] [Singles Social Networking] [Yosemite Information] [MIPS Linux] [ARM Linux Kernel] [ARM Linux] [Linux Virtualization] [Linux Security] [Linux IDE] [Linux RAID] [Linux SCSI] [Free Dating]