Jesse Gross 30444e981b openvswitch: Fix bad merge resolution. ...

git silently included an extra hunk in vport_cmd_set() during
automatic merging. This code is unreachable so it does not actually
introduce a problem but it is clearly incorrect.

Signed-off-by: Jesse Gross <jesse@nicira.com>

2013-08-14 15:48:02 -07:00

..

9p

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-07-13 17:42:22 -07:00

802

net/802/mrp: fix lockdep splat

2013-05-14 13:02:30 -07:00

8021q

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

appletalk

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

atm

net: always pass struct netdev_notifier_info to netdevice notifiers

2013-05-28 21:58:54 -07:00

ax25

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

batman-adv

net: Unmap fragment page once iterator is done

2013-06-24 01:46:01 -07:00

bluetooth

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2013-07-09 18:24:39 -07:00

bridge

bridge: fix some kernel warning in multicast timer

2013-07-06 18:12:47 -07:00

caif

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

can

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

ceph

libceph: call r_unsafe_callback when unsafe reply is received

2013-07-03 15:32:58 -07:00

core

net: access page->private by using page_private

2013-07-12 16:10:34 -07:00

dcb

…

dccp

…

decnet

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

dns_resolver

net: strict_strtoul is obsolete, use kstrtoul instead

2013-07-12 16:09:14 -07:00

dsa

…

ethernet

…

ieee802154

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

ipv4

tcp: account all retransmit failures

2013-07-12 16:15:56 -07:00

ipv6

ipv6: only static routes qualify for equal cost multipathing

2013-07-12 16:29:54 -07:00

ipx

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

irda

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

iucv

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

key

af_key: fix info leaks in notify messages

2013-06-26 15:15:54 -07:00

l2tp

l2tp: make datapath resilient to packet loss when sequence numbers enabled

2013-07-02 16:33:25 -07:00

lapb

…

llc

…

mac80211

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2013-07-09 18:24:39 -07:00

mac802154

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-04-30 03:55:20 -04:00

mpls

MPLS: Add limited GSO support

2013-05-27 22:50:59 -07:00

netfilter

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-07-03 14:55:13 -07:00

netlabel

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

netlink

netlink: fix splat in skb_clone with large messages

2013-06-27 22:44:16 -07:00

netrom

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

nfc

NFC: llcp: Fix the well known services endianness

2013-06-14 13:45:10 +02:00

openvswitch

openvswitch: Fix bad merge resolution.

2013-08-14 15:48:02 -07:00

packet

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-06-19 16:49:39 -07:00

phonet

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

rds

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

rfkill

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2013-04-22 14:58:14 -04:00

rose

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

rxrpc

…

sched

pkt_sched: sch_qfq: remove forward declaration of qfq_update_agg_ts

2013-07-11 13:01:07 -07:00

sctp

net: sctp: confirm route during forward progress

2013-07-09 12:49:56 -07:00

sunrpc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-07-14 11:42:26 -07:00

tipc

net/tipc: use %*phC to dump small buffers in hex form

2013-07-11 17:03:36 -07:00

unix

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2013-07-09 18:24:39 -07:00

vmw_vsock

VSOCK: Fix VSOCK_HASH and VSOCK_CONN_HASH

2013-06-23 23:51:48 -07:00

wimax

…

wireless

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2013-06-28 13:18:21 -04:00

x25

x25: Fix broken locking in ioctl error paths.

2013-07-01 18:15:25 -07:00

xfrm

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2013-06-26 13:23:13 -07:00

compat.c

net: Unbreak compat_sys_{send,recv}msg

2013-06-06 11:52:14 -07:00

Kconfig

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2013-07-09 18:24:39 -07:00

Makefile

MPLS: Add limited GSO support

2013-05-27 22:50:59 -07:00

nonet.c

…

socket.c

net: rename busy poll socket op and globals

2013-07-10 17:08:27 -07:00

sysctl_net.c

…