]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: de7c614) | patch
Fix mismerge.
authorimp <imp@FreeBSD.org>
Tue, 6 Aug 2019 18:15:26 +0000 (18:15 +0000)
committerimp <imp@FreeBSD.org>
Tue, 6 Aug 2019 18:15:26 +0000 (18:15 +0000)
commit9aadd339e38dbc30fbd361661089d79e3ea0c1af
treef87043e379ff237a2e1d7c1dd596fdb9909edde9tree | snapshot
parentde7c6145deb3244732e924f1f7a07eea4add1560commit | diff
Fix mismerge.

I merged passthru.c from the wrong branch (it was a branch that went further in
a direction I wound up not taking). Fix the mismerge and turn passthru on.
sbin/nvmecontrol/Makefile diff | blob | history
sbin/nvmecontrol/passthru.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.