summaryrefslogtreecommitdiffstats
path: root/arch/um/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostLinus Torvalds2022-01-181-1/+1
|\
| * virtio: wrap config->reset callsMichael S. Tsirkin2022-01-141-1/+1
* | Merge tag 'for-linus-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2022-01-112-7/+55
|\ \
| * | um: virtio_uml: Allow probing from devicetreeVincent Whitchurch2021-12-221-3/+47
| * | um: virtio_uml: Fix time-travel external time propagationJohannes Berg2021-12-211-0/+4
| * | um: virt-pci: Fix 32-bit compileJohannes Berg2021-12-211-4/+4
| |/
* / ethtool: extend ringparam setting/getting API with rx_buf_lenHao Chen2021-11-221-1/+3
|/
* Merge tag 'net-next-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2021-11-021-1/+2
|\
| * net: um: use eth_hw_addr_set()Jakub Kicinski2021-10-291-1/+2
* | um/drivers/ubd_kern: add error handling support for add_disk()Luis Chamberlain2021-10-211-4/+9
* | block: drop unused includes in <linux/genhd.h>Christoph Hellwig2021-10-181-0/+1
|/
* Merge tag 'for-linus-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2021-09-092-29/+84
|\
| * um: virt-pci: don't do DMA from stackJohannes Berg2021-08-261-26/+78
| * um: virtio_uml: fix memory leak on init failuresJohannes Berg2021-08-261-1/+3
| * um: virtio_uml: include linux/virtio-uml.hJohannes Berg2021-08-261-0/+1
| * um: make PCI emulation driver init/exit staticJohannes Berg2021-08-261-2/+2
* | Merge tag 'kbuild-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2021-09-032-0/+2
|\ \
| * | isystem: trim/fixup stdarg.h and other headersAlexey Dobriyan2021-08-192-0/+2
| |/
* | Merge tag 'tty-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gre...Linus Torvalds2021-09-011-6/+7
|\ \
| * | tty: drop put_tty_driverJiri Slaby2021-07-271-1/+1
| * | tty: stop using alloc_tty_driverJiri Slaby2021-07-271-5/+6
| |/
* | Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ne...Linus Torvalds2021-08-311-2/+6
|\ \
| * | um: vector: adjust to coalesce API changesJohannes Berg2021-08-271-2/+6
| |/
* / ubd: use bvec_virtChristoph Hellwig2021-08-161-2/+1
|/
* Merge tag 'block-5.14-2021-07-08' of git://git.kernel.dk/linux-blockLinus Torvalds2021-07-091-134/+26
|\
| * ubd: remove dead code in ubd_setup_commonChristoph Hellwig2021-06-301-10/+0
| * ubd: use blk_mq_alloc_disk and blk_cleanup_diskChristoph Hellwig2021-06-301-30/+14
| * ubd: remove the code to register as the legacy IDE driverChristoph Hellwig2021-06-301-94/+12
* | Merge tag 'for-linus-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2021-07-097-14/+951
|\ \
| * | um: fix error return code in winch_tramp()Zhen Lei2021-06-171-1/+2
| * | um: fix error return code in slip_open()Zhen Lei2021-06-171-1/+2
| * | um: Fix stack pointer alignmentYiFei Zhu2021-06-171-2/+1
| * | um: virtio/pci: enable suspend/resumeJohannes Berg2021-06-172-10/+40
| * | um: add PCI over virtio emulation driverJohannes Berg2021-06-173-0/+906
| |/
* | Merge tag 'tty-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gre...Linus Torvalds2021-07-054-15/+7
|\ \
| * | tty: remove empty tty_operations::set_termiosJiri Slaby2021-05-134-8/+0
| * | tty: make tty_operations::chars_in_buffer return uintJiri Slaby2021-05-132-3/+3
| * | tty: make tty_operations::write_room return uintJiri Slaby2021-05-132-4/+4
| |/
* | Merge branch 'work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2021-07-031-1/+1
|\ \
| * | switch file_open_root() to struct pathAl Viro2021-04-071-1/+1
* | | kernel.h: split out panic and oops helpersAndy Shevchenko2021-07-011-0/+1
| |/ |/|
* | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2021-05-071-7/+0
|\ \
| * | treewide: remove editor modelines and cruftMasahiro Yamada2021-05-071-7/+0
| |/
* | um: Remove unused including <linux/version.h>Yang Li2021-04-151-1/+0
* | um: Remove unneeded variable 'ret'Yang Li2021-04-151-3/+1
|/
* um: add a pseudo RTCJohannes Berg2021-02-125-0/+319
* um: fix spelling mistake in Kconfig "privleges" -> "privileges"Colin Ian King2021-02-121-1/+1
* um: virtio: allow devices to be configured for wakeupJohannes Berg2021-02-121-3/+16
* um: time-travel: rework interrupt handling in ext modeJohannes Berg2021-02-121-44/+48
* um: virtio: disable VQs during suspendJohannes Berg2021-02-121-0/+36