Merge branch 'mt/parallel-checkout-part-1'

Preparatory API changes for parallel checkout.

* mt/parallel-checkout-part-1:
  entry: add checkout_entry_ca() taking preloaded conv_attrs
  entry: move conv_attrs lookup up to checkout_entry()
  entry: extract update_ce_after_write() from write_entry()
  entry: make fstat_output() and read_blob_entry() public
  entry: extract a header file for entry.c functions
  convert: add classification for conv_attrs struct
  convert: add get_stream_filter_ca() variant
  convert: add [async_]convert_to_working_tree_ca() variants
  convert: make convert_attrs() and convert structs public

diff --cc apply.c
Simple merge

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/stash.c
index 3477e940e352d016fcf0547abc9c89a8eab7b19b,11f3ae303933a4c956f120fadac60bf267c78a13..c56fed33546bfb4119f16f52585e0c69b96cd06f
--- 1/builtin/stash.c
--- 2/builtin/stash.c
+++ b/builtin/stash.c
@@@ -10,6 -10,6 +10,7 @@@
  #include "strvec.h"
  #include "run-command.h"
  #include "dir.h"
++#include "entry.h"
  #include "rerere.h"
  #include "revision.h"
  #include "log-tree.h"

diff --cc cache.h
Simple merge

diff --cc convert.c
Simple merge

diff --cc entry.c
Simple merge

diff --cc unpack-trees.c
Simple merge