[PATCH 04/11] acpica: fwts_acpica: reworking required for new ACPICA changes

[Keng-Yu Lin]

>  /*
> @@ -266,10 +428,10 @@ void fwts_acpica_debug_command(fwts_framework *fw, fwts_acpica_log_callback func
>  void fwts_acpica_vprintf(const char *fmt, va_list args)
>  {
>        static char *buffer;
> -       static int  buffer_len;
> +       static size_t buffer_len;
>
>        char tmp[4096];
> -       int tmp_len;
> +       size_t tmp_len;

The part of the code change was already made in a previous patch:

commit d1723d79e2fe8610a62d7f6edc211964278820ff
Author: Colin Ian King <colin.king at canonical.com>
Date:   Tue Apr 10 04:34:02 2012 +0000

    acpica: fwts_acpica: use size_t instead of int

    Signed-off-by: Colin Ian King <colin.king at canonical.com>
    Acked-by: Alex Hung <alex.hung at canonical.com>
    Acked-by: Keng-Yu Lin <kengyu at canonical.com>

The conflict is resolved just by removing this section.

  Thanks,
-kengyu