Merge commit 'linus/master' into HEAD
Conflicts: MAINTAINERS Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
This commit is contained in:
commit
722f2a6c87
2130 changed files with 172928 additions and 37398 deletions
|
@ -246,7 +246,7 @@ static int p9_virtio_probe(struct virtio_device *vdev)
|
|||
chan->vdev = vdev;
|
||||
|
||||
/* We expect one virtqueue, for requests. */
|
||||
chan->vq = vdev->config->find_vq(vdev, 0, req_done);
|
||||
chan->vq = virtio_find_single_vq(vdev, req_done, "requests");
|
||||
if (IS_ERR(chan->vq)) {
|
||||
err = PTR_ERR(chan->vq);
|
||||
goto out_free_vq;
|
||||
|
@ -261,7 +261,7 @@ static int p9_virtio_probe(struct virtio_device *vdev)
|
|||
return 0;
|
||||
|
||||
out_free_vq:
|
||||
vdev->config->del_vq(chan->vq);
|
||||
vdev->config->del_vqs(vdev);
|
||||
fail:
|
||||
mutex_lock(&virtio_9p_lock);
|
||||
chan_index--;
|
||||
|
@ -332,7 +332,7 @@ static void p9_virtio_remove(struct virtio_device *vdev)
|
|||
BUG_ON(chan->inuse);
|
||||
|
||||
if (chan->initialized) {
|
||||
vdev->config->del_vq(chan->vq);
|
||||
vdev->config->del_vqs(vdev);
|
||||
chan->initialized = false;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -168,7 +168,7 @@ config IPV6_SIT
|
|||
into IPv4 packets. This is useful if you want to connect two IPv6
|
||||
networks over an IPv4-only path.
|
||||
|
||||
Saying M here will produce a module called sit.ko. If unsure, say Y.
|
||||
Saying M here will produce a module called sit. If unsure, say Y.
|
||||
|
||||
config IPV6_NDISC_NODETYPE
|
||||
bool
|
||||
|
|
|
@ -2765,7 +2765,7 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
|
|||
spin_unlock_bh(&ifp->lock);
|
||||
read_unlock_bh(&idev->lock);
|
||||
/*
|
||||
* If the defice is not ready:
|
||||
* If the device is not ready:
|
||||
* - keep it tentative if it is a permanent address.
|
||||
* - otherwise, kill it.
|
||||
*/
|
||||
|
|
|
@ -327,7 +327,7 @@ config NETFILTER_XT_TARGET_CONNMARK
|
|||
|
||||
If you want to compile it as a module, say M here and read
|
||||
<file:Documentation/kbuild/modules.txt>. The module will be called
|
||||
ipt_CONNMARK.ko. If unsure, say `N'.
|
||||
ipt_CONNMARK. If unsure, say `N'.
|
||||
|
||||
config NETFILTER_XT_TARGET_CONNSECMARK
|
||||
tristate '"CONNSECMARK" target support'
|
||||
|
@ -584,7 +584,7 @@ config NETFILTER_XT_MATCH_CONNMARK
|
|||
|
||||
If you want to compile it as a module, say M here and read
|
||||
<file:Documentation/kbuild/modules.txt>. The module will be called
|
||||
ipt_connmark.ko. If unsure, say `N'.
|
||||
ipt_connmark. If unsure, say `N'.
|
||||
|
||||
config NETFILTER_XT_MATCH_CONNTRACK
|
||||
tristate '"conntrack" connection tracking match support'
|
||||
|
|
|
@ -116,7 +116,7 @@ int nf_conntrack_acct_init(struct net *net)
|
|||
if (net_eq(net, &init_net)) {
|
||||
#ifdef CONFIG_NF_CT_ACCT
|
||||
printk(KERN_WARNING "CONFIG_NF_CT_ACCT is deprecated and will be removed soon. Please use\n");
|
||||
printk(KERN_WARNING "nf_conntrack.acct=1 kernel paramater, acct=1 nf_conntrack module option or\n");
|
||||
printk(KERN_WARNING "nf_conntrack.acct=1 kernel parameter, acct=1 nf_conntrack module option or\n");
|
||||
printk(KERN_WARNING "sysctl net.netfilter.nf_conntrack_acct=1 to enable it.\n");
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue