Linus Torvalds
4a873f5399
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David S. Miller:
1) Since we do RCU lookups on ipv4 FIB entries, we have to test if the
entry is dead before returning it to our caller.
2) openvswitch locking and packet validation fixes from Ansis Atteka,
Jesse Gross, and Pravin B Shelar.
3) Fix PM resume locking in IGB driver, from Benjamin Poirier.
4) Fix VLAN header handling in vhost-net and macvtap, from Basil Gor.
5) Revert a bogus network namespace isolation change that was causing
regressions on S390 networking devices.
6) If bonding decides to process and handle a LACPDU frame, we
shouldn't bump the rx_dropped counter. From Jiri Bohac.
7) Fix mis-calculation of available TX space in r8169 driver when doing
TSO, which can lead to crashes and/or hung device. From Julien
Ducourthial.
8) SCTP does not validate cached routes properly in all cases, from
Nicolas Dichtel.
9) Link status interrupt needs to be handled in ks8851 driver, from
Stephen Boyd.
10) Use capable(), not cap_raised(), in connector/userns netlink code.
From Eric W. Biederman via Andrew Morton.
11) Fix pktgen OOPS on module unload, from Eric Dumazet.
12) iwlwifi under-estimates SKB truesizes, also from Eric Dumazet.
13) Cure division by zero in SFC driver, from Ben Hutchings.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)
ks8851: Update link status during link change interrupt
macvtap: restore vlan header on user read
vhost-net: fix handle_rx buffer size
bonding: don't increase rx_dropped after processing LACPDUs
connector/userns: replace netlink uses of cap_raised() with capable()
sctp: check cached dst before using it
pktgen: fix crash at module unload
Revert "net: maintain namespace isolation between vlan and real device"
ehea: fix losing of NEQ events when one event occurred early
igb: fix rtnl race in PM resume path
ipv4: Do not use dead fib_info entries.
r8169: fix unsigned int wraparound with TSO
sfc: Fix division by zero when using one RX channel and no SR-IOV
openvswitch: Validation of IPv6 set port action uses IPv4 header
net: compare_ether_addr[_64bits]() has no ordering
cdc_ether: Ignore bogus union descriptor for RNDIS devices
bnx2x: bug fix when loading after SAN boot
e1000: Silence sparse warnings by correcting type
igb, ixgbe: netdev_tx_reset_queue incorrectly called from tx init path
openvswitch: Release rtnl_lock if ovs_vport_cmd_build_info() failed.
...
2012-05-12 12:57:01 -07:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
ARM: SoC fixes for 3.4-rc2
2012-04-05 22:13:39 -07:00
parisc: move definition of PAGE0 to asm/page.h
2012-05-10 15:12:08 -07:00
video: support DP controller driver
2012-02-13 03:02:30 +00:00
gx1fb: Fix section mismatch warnings
2011-06-24 17:00:31 +09:00
module_param: make bool parameters really bool (drivers/video/i810)
2012-01-12 23:28:59 +00:00
fbdev fixes for 3.3
2012-02-07 15:54:02 -08:00
kyrofb: fix on x86_64
2012-04-08 14:27:08 +00:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
fbdev: matroxfb: Fix compilation after fb_var_screeninfo change
2011-12-21 02:26:11 +00:00
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
video: convert mbxfb to use module_platform_driver()
2011-12-19 20:21:43 +00:00
video: msm: Fix section mismatches in mddi.c
2012-04-13 10:23:17 -07:00
drivers/video/nvidia/nvidia.c: fix warning
2012-01-12 20:13:03 -08:00
ARM: board specific updates
2012-03-27 16:27:28 -07:00
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
video: pnx4008: convert drivers/video/pnx4008/* to use module_platform_driver()
2011-12-19 20:21:43 +00:00
riva/fbdev: fix several -Wuninitialized
2012-02-13 02:59:14 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
sisfb: use display information in info not in var for panning
2011-08-19 10:34:52 +02:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-next
2012-03-13 23:19:58 +00:00
68328fb: use display information in info not in var for panning
2011-08-19 10:28:58 +02:00
acornfb: use display information in info not in var for panning
2011-08-19 10:29:34 +02:00
fbdev: amba: Enable module alias autogeneration for AMBA drivers
2011-11-22 10:58:33 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: Convert vmalloc/memset to vzalloc
2011-06-02 17:25:35 +09:00
arkfb: use display information in info not in var for panning
2011-08-19 10:29:44 +02:00
m68k/atari: Do not use "/" in interrupt names
2011-05-19 18:19:10 +02:00
atmel_lcdfb: support 16bit BGR:565 mode, remove unsupported 15bit modes
2012-01-28 19:54:10 +00:00
fbdev: fix au1*fb builds
2012-04-08 14:27:09 +00:00
fb: fix au1100fb bitrot.
2011-10-03 15:52:38 +00:00
fbdev: fix au1*fb builds
2012-04-08 14:27:09 +00:00
video: use gpio_request_one
2012-01-28 20:50:11 +00:00
video: use gpio_request_one
2012-01-28 20:50:11 +00:00
blackfin: fix compile error in bfin-lq035q1-fb.c
2012-04-26 14:46:51 -04:00
treewide: Fix comment and string typo 'bufer'
2011-12-06 09:53:40 +01:00
fbdev: bfin_adv7393fb: Drop needless include
2012-03-21 10:27:37 +00:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
video: Convert vmalloc/memset to vzalloc
2011-06-02 17:25:35 +09:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6
2012-01-14 15:11:19 -08:00
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
Drivers: video: controlfb: fixed a brace coding style issue
2011-11-22 01:00:16 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
fbdev: da8xx: add support for SP10Q010 display
2012-03-19 22:59:47 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
efifb: Fix call to wrong unregister function
2011-06-14 16:37:46 +09:00
ep93xx: Use ioremap for backlight driver
2012-03-14 11:41:10 +11:00
fbdev: unicore32: use display information in info not in var for panning
2011-08-19 10:31:01 +02:00
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next
2011-08-29 09:14:30 +00:00
video: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/video
2011-10-31 19:31:33 -04:00
udlfb: remove sysfs framebuffer device with USB .disconnect()
2012-03-15 13:35:22 +00:00
fbdev: fix parsing of standard timings
2011-09-01 00:31:05 +00:00
fb: avoid possible deadlock caused by fb_set_suspend
2011-09-02 17:58:29 +00:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
drivers/video: compile fixes for fsl-diu-fb.c
2012-01-28 19:35:24 +00:00
g364fb: use display information in info not in var for panning
2011-08-19 10:31:09 +02:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
grvga: fix section mismatch warnings
2012-01-03 16:02:55 +00:00
gxt4500: use display information in info not in var for panning
2011-08-19 10:31:17 +02:00
hecubafb: add module_put on error path in hecubafb_probe()
2011-06-24 17:00:39 +09:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
Resurrect Intel740 driver: i740fb
2012-02-15 04:31:21 +00:00
i740fb: fix compile error when CONFIG_MTRR is not selected
2012-02-19 19:11:51 +00:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
imsttfb: use display information in info not in var for panning
2011-08-19 10:31:39 +02:00
drivers/video/imxfb.c: add missing clk_put
2011-06-02 17:07:41 +09:00
ARM: global cleanups
2012-03-27 16:03:32 -07:00
macfb: fix black and white modes
2012-01-22 14:50:02 +01:00
Resurrect Intel740 driver: i740fb
2012-02-15 04:31:21 +00:00
video: Convert vmalloc/memset to vzalloc
2011-06-02 17:25:35 +09:00
fbdev: fix indentation in modedb.c
2011-09-14 16:40:52 +00:00
dmaengine/dma_slave: introduce inline wrappers
2012-03-21 19:20:22 +05:30
Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6
2012-01-14 15:11:19 -08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
offb: Fix setting of the pseudo-palette for >8bpp
2012-01-03 12:09:25 +11:00
video: platinumfb: Add __devexit_p at necessary place
2011-10-15 00:19:58 +00:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: irq: Remove IRQF_DISABLED
2011-10-03 15:52:22 +00:00
drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
2012-03-13 23:17:31 +00:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
drivers/video/pxa168fb.c: use devm_ functions
2012-02-24 00:49:59 +00:00
video: pxafb: add clk_prepare/clk_unprepare calls
2012-03-21 10:29:01 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: s3c-fb: Add support EXYNOS5 FIMD
2012-03-06 11:57:14 +00:00
video: s3c2410: fix checkpatch error and warnings
2011-12-03 22:10:43 +00:00
s3fb: fix Virge/VX
2011-12-21 02:25:21 +00:00
FB: sa11x0: convert to use platform resource and ioremap()
2012-02-24 09:39:59 +00:00
FB: sa11x0: convert to use platform resource and ioremap()
2012-02-24 09:39:59 +00:00
Drivers: video: sbuslib: fixed a brace coding style issue
2011-11-22 01:00:24 +00:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info
2012-03-21 07:24:01 +00:00
fbdev: sh_mobile_hdmi: Don't access LCDC fb_info
2012-03-12 22:40:54 +01:00
fbdev: sh_mobile_meram: Remove unneeded sanity checks
2012-03-12 22:41:14 +01:00
fbdev: sh_mobile_lcdc: Don't store copy of platform data
2012-03-12 22:41:12 +01:00
fbdev: sh_mobile_meram: Implement system suspend/resume
2012-03-12 22:41:14 +01:00
video: Fix speficied typo
2011-06-24 17:14:39 +09:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
Fix common misspellings
2011-03-31 11:26:23 -03:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
video: irq: Remove IRQF_DISABLED
2011-10-03 15:52:22 +00:00
tridentfb: use display information in info not in var for panning
2011-08-19 10:35:18 +02:00
fbdev updates for 3.4
2012-03-22 20:43:40 -07:00
connector/userns: replace netlink uses of cap_raised() with capable()
2012-05-10 23:21:39 -04:00
video: Fix speficied typo
2011-06-24 17:14:39 +09:00
vesafb: fix memory leak
2011-07-04 16:02:48 +09:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
vga16fb: use display information in info not in var for panning
2011-08-19 10:35:34 +02:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
vt8623fb: use display information in info not in var for panning
2011-08-19 10:36:20 +02:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
drivers/video/xen-fbfront.c: add missing cleanup code
2012-05-07 06:41:56 -04:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
4a873f5399