From: David S. Miller Date: Mon, 20 Aug 2012 09:30:41 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net... X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4c6de2fedc321e17487b74547ad9f73f248faaac;p=~shefty%2Frdma-dev.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net-next Peter P Waskiewicz Jr says: ==================== This series contains multiple updates to the ixgbe driver. The following are changes since commit 02644a17457414f38e29f32d5c640b06d08fa092: sctp: fix bogus if statement in sctp_auth_recv_cid() and are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net-next master Alexander Duyck (9): ixgbe: Remove code that was initializing Rx page offset ixgbe: combine ixgbe_add_rx_frag and ixgbe_can_reuse_page ixgbe: Only use double buffering if page size is less than 8K ixgbe: Have the CPU take ownership of the buffers sooner ixgbe: Make pull tail function separate from rest of cleanup_headers ixgbe: Copybreak sooner to avoid get_page/put_page and offset change overhead ixgbe: Make allocating skb and placing data in it a separate function ixgbe: Roll RSC code into non-EOP code ixgbe: Rewrite code related to configuring IFCS bit in Tx descriptor ==================== Signed-off-by: David S. Miller --- 4c6de2fedc321e17487b74547ad9f73f248faaac