openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers
History
Linus Torvalds 8aaa51b63c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Pull networking fixes from David Miller:
 "Just a few fixes trickling in at this point.

  1) If we see an attached socket on an skb in the ipv4 forwarding path,
     bail.  This can happen due to races with FIB rule addition, and
     deletion, and we should just drop such frames.  From Sebastian
     Pöhn.

  2) pppoe receive should only accept packets destined for this hosts's
     MAC address.  From Joakim Tjernlund.

  3) Handle checksum unwrapping properly in ppp receive properly when
     it's encapsulated in UDP in some way, fix from Tom Herbert.

  4) Fix some bugs in mv88e6xxx DSA driver resulting from the conversion
     from register offset constants to mnenomic macros.  From Vivien
     Didelot.

  5) Fix handling of HCA max message size in mlx4 adapters, from Eran
     Ben ELisha"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net/mlx4_core: Fix reading HCA max message size in mlx4_QUERY_DEV_CAP
  tcp: add memory barriers to write space paths
  altera tse: Error-Bit on tx-avalon-stream always set.
  net: dsa: mv88e6xxx: use PORT_DEFAULT_VLAN
  net: dsa: mv88e6xxx: fix setup of port control 1
  ppp: call skb_checksum_complete_unset in ppp_receive_frame
  net: add skb_checksum_complete_unset
  pppoe: Lacks DST MAC address check
  ip_forward: Drop frames with attached skb->sk
 		2015-04-21 22:37:27 -07:00
..
accessibility
…
acpi ACPICA updates for v4.1-rc1 2015-04-17 15:01:29 -04:00
amba
…
android
…
ata powerpc updates for 4.1 2015-04-16 13:53:32 -05:00
atm
…
auxdisplay
…
base power: wakeup: remove use of seq_printf return value 2015-04-15 16:35:24 -07:00
bcma Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2015-04-17 15:50:54 -04:00
block Merge branch 'x86-pmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2015-04-18 11:42:49 -04:00
bluetooth Bluetooth: btusb: Use proper data structures for Intel vendor events 2015-04-09 10:42:18 +03:00
bus Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2015-04-17 15:50:54 -04:00
cdrom
…
char Char/Misc driver patches for 4.1-rc1 2015-04-21 09:42:58 -07:00
clk The changes to the common clock framework for 4.0 are mostly new clock 2015-04-21 09:24:09 -07:00
clocksource This is the final removal (after several years!) of the obsolete cpus_* 2015-04-20 10:19:03 -07:00
connector
…
cpufreq intel_pstate: Knights Landing support 2015-04-11 02:13:29 +02:00
cpuidle This is the final removal (after several years!) of the obsolete cpus_* 2015-04-20 10:19:03 -07:00
crypto This is the final removal (after several years!) of the obsolete cpus_* 2015-04-20 10:19:03 -07:00
dca
…
devfreq
…
dio
…
dma TTY/Serial patches for 4.1-rc1 2015-04-21 09:33:10 -07:00
dma-buf
…
edac
…
eisa
…
extcon Char/Misc driver patches for 4.1-rc1 2015-04-21 09:42:58 -07:00
firewire
…
firmware TTY/Serial patches for 4.1-rc1 2015-04-21 09:33:10 -07:00
fmc
…
gpio This is the bulk of GPIO changes for the v4.1 development 2015-04-18 08:22:10 -04:00
gpu fbdev changes for v4.1 2015-04-20 15:16:25 -07:00
hid Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2015-04-14 18:25:15 -07:00
hsi HSI: cmt_speech: fix error return code 2015-04-05 14:45:27 +02:00
hv Drivers: hv: hv_balloon: correctly handle num_pages>INT_MAX case 2015-04-03 16:20:12 +02:00
hwmon hwmon: (w83795) use find_closest_descending() in pwm_freq_to_reg() 2015-04-17 09:03:55 -04:00
hwspinlock
…
hwtracing/coresight Char/Misc driver patches for 4.1-rc1 2015-04-21 09:42:58 -07:00
i2c i2c: core: Export bus recovery functions 2015-04-15 21:02:07 +02:00
ide ide: remove deprecated use of pci api 2015-04-17 15:32:07 -04:00
idle Power management and ACPI updates for v4.1-rc1 2015-04-14 20:21:54 -07:00
iio Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2015-04-14 09:50:27 -07:00
infiniband Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-17 16:31:08 -04:00
input Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2015-04-21 12:54:08 -07:00
iommu IOMMU Updates for Linux v4.1 2015-04-20 10:50:05 -07:00
ipack
…
irqchip This is the final removal (after several years!) of the obsolete cpus_* 2015-04-20 10:19:03 -07:00
isdn Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2015-04-15 09:00:47 -07:00
leds This is the bulk of GPIO changes for the v4.1 development 2015-04-18 08:22:10 -04:00
lguest
…
macintosh Merge branch 'next-remove-ldst' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next 2015-04-07 13:25:14 +10:00
mailbox
…
mcb mcb: request_mem_region() returns NULL on error 2015-04-03 16:15:30 +02:00
md - Most extensive changes this cycle are the DM core improvements to add 2015-04-18 08:14:18 -04:00
media media: remove unused variable that causes a warning 2015-04-21 12:49:33 -07:00
memory
…
memstick memstick: mspro_block: add missing curly braces 2015-04-17 09:04:09 -04:00
message
…
mfd == Changes to existing drivers == 2015-04-14 17:29:55 -07:00
misc Char/Misc driver patches for 4.1-rc1 2015-04-21 09:42:58 -07:00
mmc SCSI misc on 20150416 2015-04-16 19:02:04 -04:00
mtd This pull request includes the following UBI/UBIFS changes: 2015-04-15 13:43:40 -07:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-21 22:37:27 -07:00
nfc NFC: logging neatening 2015-04-07 12:05:12 +02:00
ntb
…
nubus
…
of Devicetree changes for v4.1 2015-04-18 08:30:10 -04:00
oprofile oprofile: reduce mmap_sem hold for mm->exe_file 2015-04-17 09:04:11 -04:00
parisc parisc: Eliminate sg_virt_addr() and private scatterlist.h 2015-04-21 22:02:43 +02:00
parport
…
pci xen: features and fixes for 4.1-rc0 2015-04-16 14:01:03 -05:00
pcmcia
…
phy USB patches for 4.1-rc1 2015-04-13 17:07:21 -07:00
pinctrl pinctrl: fix allmodconfig noise 2015-04-15 10:02:42 +02:00
platform Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2015-04-17 15:50:54 -04:00
pnp Power management and ACPI updates for v4.1-rc1 2015-04-14 20:21:54 -07:00
power power: twl4030_madc_battery: Add missing MODULE_ALIAS 2015-04-06 19:39:57 +02:00
powercap powercap / RAPL: mark rapl_ids array as __initconst 2015-04-11 02:21:15 +02:00
pps
…
ps3
…
ptp
…
pwm
…
rapidio
…
ras
…
regulator == Changes to existing drivers == 2015-04-14 17:29:55 -07:00
remoteproc
…
reset
…
rpmsg
…
rtc drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic 2015-04-17 09:04:12 -04:00
s390 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 2015-04-20 10:15:33 -07:00
sbus drivers/sbus/char/envctrl.c: ignore orderly_poweroff return value 2015-04-15 16:35:23 -07:00
scsi SCSI misc on 20150419 2015-04-20 15:25:19 -07:00
sfi
…
sh
…
sn
…
soc
…
spi Merge remote-tracking branches 'spi/topic/spidev' and 'spi/topic/spidev-test' into spi-next 2015-04-11 23:09:31 +01:00
spmi spmi: pmic_arb: remove ARM build time dependency 2015-04-03 16:15:30 +02:00
ssb Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2015-04-17 15:50:54 -04:00
staging Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus 2015-04-21 09:44:55 -03:00
target iscsi target: fix oops when adding reject pdu 2015-04-10 12:33:55 -07:00
tc
…
thermal drivers: thermal: st: remove several sparse warnings 2015-04-07 13:43:28 -07:00
thunderbolt
…
tty TTY/Serial patches for 4.1-rc1 2015-04-21 09:33:10 -07:00
uio Revert "uio: constify of_device_id array" 2015-04-03 16:04:21 +02:00
usb Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus 2015-04-21 09:44:55 -03:00
uwb
…
vfio vfio-pci: Fix use after free 2015-04-08 08:11:51 -06:00
vhost new helper: msg_data_left() 2015-04-11 15:53:35 -04:00
video fbdev changes for v4.1 2015-04-20 15:16:25 -07:00
virt
…
virtio
…
vlynq
…
vme
…
w1
…
watchdog Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 2015-04-14 20:51:44 -07:00
xen xen: features and fixes for 4.1-rc0 2015-04-16 14:01:03 -05:00
zorro
…
Kconfig
…
Makefile coresight: moving to new "hwtracing" directory 2015-04-03 16:17:04 +02:00