external/opal-prd/opal-prd.service | 4 3 + 1 - 0 !
1 file changed, 3 insertions(+), 1 deletion(-)

 resolve merge conflict by incorporating both suggestions

external/xscom-utils/Makefile | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 use default m32/m64 gcc flag

On x86, 32b compilation fails, assuming that the build machine is 64b

external/common/get_arch.sh | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 use file operation used on x86 for arch_unknown

On arches where only file operation make sense such as x86, use the same
code.

external/gard/opal-gard.1 | 30 0 + 30 - 0 !
external/gard/opal-gard.8 | 30 30 + 0 - 0 !
external/gard/rules.mk | 2 1 + 1 - 0 !
external/pflash/Makefile | 2 1 + 1 - 0 !
external/pflash/pflash.1 | 96 0 + 96 - 0 !
external/pflash/pflash.8 | 96 96 + 0 - 0 !
external/xscom-utils/Makefile | 6 3 + 3 - 0 !
external/xscom-utils/getscom.1 | 23 0 + 23 - 0 !
external/xscom-utils/getscom.8 | 23 23 + 0 - 0 !
external/xscom-utils/getsram.1 | 23 0 + 23 - 0 !
external/xscom-utils/getsram.8 | 23 23 + 0 - 0 !
external/xscom-utils/putscom.1 | 18 0 + 18 - 0 !
external/xscom-utils/putscom.8 | 18 18 + 0 - 0 !
13 files changed, 195 insertions(+), 195 deletions(-)

 move sbin commands manpages from section 1 to 8

[git-debrebase split: mixed commit: upstream part]

libstb/Makefile.inc | 1 0 + 1 - 0 !
1 file changed, 1 deletion(-)

 skip tss2 build : removed because not dfsg compatible