summaryrefslogtreecommitdiffstats
path: root/drivers/s390
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39...Linus Torvalds2017-11-1721-92/+90
|\
| * zfcp: purely mechanical update using timer API, plus blank linesSteffen Maier2017-11-163-4/+4
| * s390/scsi: Convert timers to use timer_setup()Kees Cook2017-11-163-14/+17
| * s390/ap_bus: Convert timers to use timer_setup()Kees Cook2017-11-143-7/+7
| * s390/sclp: Convert timers to use timer_setup()Kees Cook2017-11-148-51/+48
| * s390/cio: Convert timers to use timer_setup()Kees Cook2017-11-144-15/+14
| * s390: qdio: Convert timers to use timer_setup()Kees Cook2017-11-143-5/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2017-11-1511-293/+904
|\ \ | |/ |/|
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-11-04141-0/+141
| |\
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-10-303-7/+21
| |\ \
| * | | s390/qeth: don't dump control cmd twiceJulian Wiedmann2017-10-201-1/+0
| * | | s390/qeth: support GRO flush timerJulian Wiedmann2017-10-201-1/+1
| * | | s390/qeth: try harder to get packets from RX bufferJulian Wiedmann2017-10-201-3/+1
| * | | s390/qeth: consolidate skb allocationJulian Wiedmann2017-10-201-40/+31
| * | | s390/qeth: clean up page frag creationJulian Wiedmann2017-10-201-20/+11
| * | | s390/qeth: no VLAN support on OSMJulian Wiedmann2017-10-201-11/+6
| * | | s390/qeth: don't verify device when setting MAC addressJulian Wiedmann2017-10-201-23/+0
| * | | s390/qeth: clean up initial MTU determinationJulian Wiedmann2017-10-201-10/+4
| * | | s390/qeth: fix early exit from error pathJulian Wiedmann2017-10-201-2/+4
| * | | s390/qeth: use kstrtobool() in qeth_bridgeport_hostnotification_store()Andy Shevchenko2017-10-201-8/+5
| * | | s390/qeth: remove duplicated device matchingJulian Wiedmann2017-10-204-50/+9
| * | | s390/drivers: use setup_timerAllen Pais2017-10-201-6/+2
| * | | s390/qeth: rely on kernel for feature recoveryJulian Wiedmann2017-10-202-23/+19
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-09-236-9/+36
| |\ \ \
| * | | | s390/qeth: tidy up parameter naming for qeth_do_send_packet()Jens Remus2017-09-181-1/+2
| * | | | s390/qeth: fold VLAN handling into l3_rebuild_skb()Julian Wiedmann2017-09-181-16/+11
| * | | | s390/qeth: translate SETVLAN/DELVLAN errorsJulian Wiedmann2017-09-182-12/+36
| * | | | s390/qeth: simplify L3 sysfs group managementJulian Wiedmann2017-09-181-33/+12
| * | | | s390/qeth: don't take queue lock in send_packet_fast()Julian Wiedmann2017-09-184-22/+9
| * | | | s390/qeth: remove unused code in qdio_establish_cq()Julian Wiedmann2017-09-181-1/+0
| * | | | s390/qeth: add VNICC get/set timeout supportHans Wippel2017-09-185-5/+190
| * | | | s390/qeth: add VNICC enable/disable supportHans Wippel2017-09-185-14/+392
| * | | | s390/qeth: add basic VNICC supportHans Wippel2017-09-184-4/+172
* | | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2017-11-134-23/+14
|\ \ \ \ \
| * | | | | timer: Fix two mistakes in callback conversionsKees Cook2017-10-051-1/+0
| * | | | | timer: Remove init_timer_on_stack() in favor of timer_setup_on_stack()Kees Cook2017-10-054-22/+14
| | |/ / / | |/| | |
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39...Linus Torvalds2017-11-1332-828/+327
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge tag 'vfio-ccw-20171109' of git://git.kernel.org/pub/scm/linux/kernel/gi...Heiko Carstens2017-11-101-0/+2
| |\ \ \ \
| | * | | | s390: vfio-ccw: Do not attempt to free no-op, test and tic cda.Jason J. Herne2017-11-081-0/+2
| * | | | | s390/zcrypt: Rework struct ap_qact_ap_info.Harald Freudenberger2017-11-092-21/+21
| * | | | | s390/dasd: avoid calling do_gettimeofday()Arnd Bergmann2017-11-081-8/+8
| |/ / / /
| * | | | s390/qdio: sanitize put_indicatorSebastian Ott2017-11-031-4/+2
| * | | | s390/qdio: use atomic_cmpxchgSebastian Ott2017-11-031-3/+1
| * | | | vmur: convert urdev.ref_count from atomic_t to refcount_tElena Reshetova2017-10-262-5/+7
| * | | | s390/zcrypt: Introduce QACT support for AP bus devices.Harald Freudenberger2017-10-235-15/+116
| * | | | s390/zcrypt: Enable special header file flag for AU CPRPHarald Freudenberger2017-10-231-1/+2
| * | | | s390/zcrypt: CEX6S exploitationHarald Freudenberger2017-10-234-15/+40
| * | | | s390/dasd: remove unused debug macrosSebastian Ott2017-10-181-16/+0
| * | | | s390/debug: improve debug_eventSebastian Ott2017-10-185-41/+7
| * | | | vfio: ccw: validate the count field of a ccw before pinningDong Jia Shi2017-10-161-1/+17