From: David S. Miller Date: Thu, 11 Jul 2013 00:10:40 +0000 (-0700) Subject: Merge "net: finish renaming lls to busy poll" X-Git-Tag: v3.11-rc1~5^2~33 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e00fd479465d00bf0a97cb371c63787e1887a2e;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge "net: finish renaming lls to busy poll" Eliezer Tamir says: ==================== Here are three patches that complete the rename of lls to busy-poll 1. rename include/net/ll_poll.h to include/net/busy_poll.h 2. Rename ndo_ll_poll to ndo_busy_poll. Rename sk_mark_ll to sk_mark_napi_id. Rename skb_mark_ll to skb_mark_napi_id. Correct all useres of these functions. Update comments and defines in include/net/busy_poll.h 3. Rename LL_SO to BUSY_POLL_SO Rename sysctl_net_ll_{read,poll} to sysctl_busy_{read,poll} Fix up users of these variables. Fix documentation for sysctl. v2 fixed forgetting the ndo changes in v1 v3 is a resend with -M ==================== Signed-off-by: David S. Miller --- 0e00fd479465d00bf0a97cb371c63787e1887a2e