leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8a9ea3237e
linux/drivers/s390/cio
History
Linus Torvalds 8a9ea3237e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
  dp83640: free packet queues on remove
  dp83640: use proper function to free transmit time stamping packets
  ipv6: Do not use routes from locally generated RAs
  |PATCH net-next] tg3: add tx_dropped counter
  be2net: don't create multiple RX/TX rings in multi channel mode
  be2net: don't create multiple TXQs in BE2
  be2net: refactor VF setup/teardown code into be_vf_setup/clear()
  be2net: add vlan/rx-mode/flow-control config to be_setup()
  net_sched: cls_flow: use skb_header_pointer()
  ipv4: avoid useless call of the function check_peer_pmtu
  TCP: remove TCP_DEBUG
  net: Fix driver name for mdio-gpio.c
  ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
  rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
  ipv4: fix ipsec forward performance regression
  jme: fix irq storm after suspend/resume
  route: fix ICMP redirect validation
  net: hold sock reference while processing tx timestamps
  tcp: md5: add more const attributes
  Add ethtool -g support to virtio_net
  ...

Fix up conflicts in:
 - drivers/net/Kconfig:
	The split-up generated a trivial conflict with removal of a
	stale reference to Documentation/networking/net-modules.txt.
	Remove it from the new location instead.
 - fs/sysfs/dir.c:
	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
	with Eric Biederman's changes for tagged directories.
2011-10-25 13:25:22 +02:00
..
airq.c [S390] cio: airq - fix array boundary 2009-03-26 15:24:14 +01:00
blacklist.c s390: Convert vmalloc/memset to vzalloc 2011-09-15 13:55:02 +02:00
blacklist.h
ccwgroup.c [S390] ccwgroup_driver: remove duplicate members 2011-03-23 10:15:59 +01:00
ccwreq.c [S390] ccwreq: add ability to use all paths 2010-08-09 18:12:54 +02:00
chp.c [S390] cio: update descriptor in chsc_chp_vary 2010-10-25 16:10:18 +02:00
chp.h [S390] cio: update descriptor in chsc_chp_vary 2010-10-25 16:10:18 +02:00
chsc_sch.c [S390] css_driver: remove duplicate members 2011-03-15 17:08:24 +01:00
chsc_sch.h
chsc.c [S390] chsc: process channel-path-availability information 2011-05-23 10:24:31 +02:00
chsc.h [S390] cio: obtain mdc value per channel path 2011-01-05 12:47:28 +01:00
cio_debug.h
cio.c [S390] cio: fix cio_tpi ignoring adapter interrupts 2011-09-26 16:40:50 +02:00
cio.h [S390] css: remove subchannel private 2011-03-15 17:08:24 +01:00
cmf.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
crw.c [S390] cio: wait for channel report 2010-02-26 22:37:29 +01:00
css.c PM: Improve error code of pm_notifier_call_chain() 2011-07-15 23:58:20 +02:00
css.h [S390] css_bus_type: make it static 2011-03-15 17:08:24 +01:00
device_fsm.c [S390] get rid of unused variables 2011-05-23 10:24:28 +02:00
device_id.c [S390] cio: use all available paths for some internal I/O 2010-08-09 18:12:54 +02:00
device_ops.c [S390] get rid of unused variables 2011-05-23 10:24:28 +02:00
device_pgid.c [S390] cio: notify drivers of channel path events 2010-10-25 16:10:19 +02:00
device_status.c [S390] cio: remove intretry flag 2009-12-07 12:51:31 +01:00
device.c [S390] cio: prevent purging of CCW devices in the online state 2011-04-04 09:43:33 +02:00
device.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
fcx.c [S390] drivers: Correct size given to memset 2009-12-18 17:43:32 +01:00
idset.c [S390] cio: introduce consistent subchannel scanning 2009-09-22 22:58:42 +02:00
idset.h [S390] cio: introduce consistent subchannel scanning 2009-09-22 22:58:42 +02:00
io_sch.h [S390] css: move io_private to drv_data 2011-03-15 17:08:23 +01:00
ioasm.h [S390] cio: move asms to generic header 2011-03-15 17:08:23 +01:00
isc.c
itcw.c [S390] cio: reduce memory consumption of itcw structures 2011-01-05 12:47:29 +01:00
Makefile [S390] qdio: convert global statistics to per-device stats 2010-01-04 09:05:58 +01:00
orb.h [S390] cio: move orb definitions to separate header 2011-03-15 17:08:23 +01:00
qdio_debug.c qdio: support asynchronous delivery of storage blocks 2011-08-13 01:10:16 -07:00
qdio_debug.h
qdio_main.c qdio: support forced signal adapter indications 2011-08-13 01:10:16 -07:00
qdio_setup.c qdio: support asynchronous delivery of storage blocks 2011-08-13 01:10:16 -07:00
qdio_thinint.c qdio: support asynchronous delivery of storage blocks 2011-08-13 01:10:16 -07:00
qdio.h qdio: support forced signal adapter indications 2011-08-13 01:10:16 -07:00