Changeset f9d0a86 in mainline for .bzrignore

Timestamp:

2017-11-14T12:24:42Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6cad776

Parents:

887c9de (diff), d2d142a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 01:04:19)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 12:24:42)

Message:

Merge tag '0.7.1'

The merge wasn't clean, because of changes in build system. The most
significant change was partial revert of usbhc callback refactoring,
which now does not take usb transfer batch, but few named fields again.

File:

• .bzrignore (modified) (6 diffs)

.bzrignore

@@ -6 +6 @@
 *.so.*
 *.d
+tag
+deps.mk
 Makefile.ag.depend
 Makefile.common
@@ -210 +212 @@
 uspace/dist/drv/isa/
 uspace/dist/drv/kfb/
+uspace/dist/drv/msim-con/
 uspace/dist/drv/ne2k/
 uspace/dist/drv/ns8250/
@@ -222 +225 @@
 uspace/dist/drv/rtl8169/
 uspace/dist/drv/sb16/
+uspace/dist/drv/ski-con/
+uspace/dist/drv/sun4v-con/
 uspace/dist/drv/test1/
 uspace/dist/drv/test2/
@@ -277 +282 @@
 uspace/drv/block/ata_bd/ata_bd
 uspace/drv/block/ddisk/ddisk
+uspace/drv/block/usbmast/usbmast
 uspace/drv/bus/adb/cuda_adb/cuda_adb
 uspace/drv/bus/isa/isa
@@ -284 +290 @@
 uspace/drv/bus/usb/uhci/uhci
 uspace/drv/bus/usb/usbflbk/usbflbk
-uspace/drv/bus/usb/usbhid/usbhid
 uspace/drv/bus/usb/usbhub/usbhub
-uspace/drv/bus/usb/usbmast/usbmast
 uspace/drv/bus/usb/usbmid/usbmid
 uspace/drv/bus/usb/vhc/vhc
 uspace/drv/bus/usb/xhci/xhci
 uspace/drv/bus/usb/xhci/test-xhci
-uspace/drv/char/atkbd/atkbd
 uspace/drv/char/i8042/i8042
 uspace/drv/char/ns8250/ns8250
 uspace/drv/char/pl050/pl050
 uspace/drv/char/ps2mouse/ps2mouse
-uspace/drv/char/xtkbd/xtkbd
+uspace/drv/char/ski-con/ski-con
+uspace/drv/char/sun4v-con/sun4v-con
 uspace/drv/fb/amdm37x_dispc/amdm37x_dispc
 uspace/drv/fb/kfb/kfb
+uspace/drv/hid/atkbd/atkbd
+uspace/drv/hid/xtkbd/xtkbd
+uspace/drv/hid/ps2mouse/ps2mouse
+uspace/drv/hid/usbhid/usbhid
 uspace/drv/intctl/apic/apic
 uspace/drv/intctl/i8259/i8259
 uspace/drv/intctl/icp-ic/icp-ic
+uspace/drv/intctl/obio/obio
 uspace/drv/nic/ar9271/ar9271
 uspace/drv/nic/e1k/e1k
@@ -314 +323 @@
 uspace/drv/platform/pc/pc
 uspace/drv/platform/rootpc/rootpc
+uspace/drv/platform/ski/ski
+uspace/drv/platform/sun4v/sun4v
 uspace/drv/root/root/root
 uspace/drv/root/virt/virt