David S. Miller
59b9997bab
Revert "net: maintain namespace isolation between vlan and real device"
...
This reverts commit 8a83a00b07 .
It causes regressions for S390 devices, because it does an
unconditional DST drop on SKBs for vlans and the QETH device
needs the neighbour entry hung off the DST for certain things
on transmit.
Arnd can't remember exactly why he even needed this change.
Conflicts:
drivers/net/macvlan.c
net/8021q/vlan_dev.c
net/core/dev.c
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-10 23:03:34 -04:00
..
acpi
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
asm-generic
asm-generic: Allow overriding clock_t and add attributes to siginfo_t
2012-04-23 16:29:18 -07:00
crypto
crypto: user - Fix lookup of algorithms with IV generator
2012-03-29 19:52:47 +08:00
drm
Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes
2012-04-12 17:42:01 +01:00
keys
linux
Revert "net: maintain namespace isolation between vlan and real device"
2012-05-10 23:03:34 -04:00
math-emu
media
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
misc
mtd
net
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2012-05-01 14:14:05 -04:00
pcmcia
rdma
rxrpc
scsi
[SCSI] libsas, libata: fix start of life for a sas ata_port
2012-04-23 12:11:47 +01:00
sound
ALSA: hda - hide HDMI/ELD printks unless snd.debug=2
2012-04-10 14:53:55 +02:00
target
trace
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-04-04 10:04:42 -07:00
video
Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
2012-03-27 18:17:02 -07:00
xen
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-04-04 17:13:43 -07:00
Kbuild