Zhi Yong Wu
c9d8ca0454
net, rps: fix build failure when CONFIG_RPS isn't set ...
In file included from net/socket.c:99:0:
include/net/sock.h: In function ‘sock_rps_record_flow’:
include/net/sock.h:849:30: error: ‘const struct sock’ has no member named ‘sk_rxhash’
include/net/sock.h: In function ‘sock_rps_reset_flow’:
include/net/sock.h:854:29: error: ‘const struct sock’ has no member named ‘sk_rxhash’
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-31 15:59:27 -05:00
Merge branch 'acpica'
2013-11-27 01:03:27 +01:00
lib: hash: follow-up fixups for arch hash
2013-12-19 00:14:53 -05:00
crypto: scatterwalk - Use sg_chain_ptr on chain entries
2013-12-09 19:58:52 +08:00
Merge branch 'ttm-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes
2013-11-21 18:46:56 +10:00
For the 3.13 merge window we have a couple of new drivers for the AMS
2013-11-15 16:37:40 -08:00
net/mlx4_core: Add basic support for TCP/IP offloads under tunneling
2013-12-31 14:31:43 -05:00
[media] videobuf2: Add support for file access mode flags for DMABUF exporting
2013-12-09 14:50:50 -02:00
net, rps: fix build failure when CONFIG_RPS isn't set
2013-12-31 15:59:27 -05:00
Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next
2013-11-17 08:22:19 -08:00
[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers
2013-11-29 08:48:39 +04:00
ALSA: memalloc.h - fix wrong truncation of dma_addr_t
2013-12-10 15:30:46 +01:00
target_core_alua: Store supported ALUA states
2013-11-20 11:26:37 -08:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-12-02 10:13:09 -08:00
sch_netem: support of 64bit rates
2013-12-31 14:31:44 -05:00
fbdev changes for 3.13
2013-11-14 14:44:20 +09:00
Features:
2013-11-15 13:34:37 +09:00
c9d8ca0454