[AUH] mmc-utils: upgrading to 43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc FAILED

[AUH] mmc-utils: upgrading to 43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc FAILED

[auh]

[-- Attachment #1: Type: text/plain, Size: 2779 bytes --]

Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe *mmc-utils* to *43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc* has Failed (devtool error).

Detailed error information:

Running 'devtool upgrade' for recipe mmc-utils failed.
NOTE: Starting bitbake server...
NOTE: Reconnecting to bitbake server...
NOTE: Retrying server connection (#1)...
Loading cache...done.
Loaded 1459 entries from dependency cache.
INFO: Extracting current version source...
NOTE: Resolving any missing task queue dependencies

Build Configuration:
BB_VERSION           = "1.51.0"
BUILD_SYS            = "x86_64-linux"
NATIVELSBSTRING      = "universal"
TARGET_SYS           = "x86_64-poky-linux"
MACHINE              = "qemux86-64"
DISTRO               = "poky"
DISTRO_VERSION       = "3.3+snapshot-82ae95134dbac5d1c58b52d04d64d6f9d14b0f7c"
TUNE_FEATURES        = "m64 core2"
TARGET_FPU           = ""
meta                 
meta-poky            
meta-yocto-bsp       = "tmp-auh-upgrades:82ae95134dbac5d1c58b52d04d64d6f9d14b0f7c"
workspace            = "master:ed2e3b739a7e0e8daad665fed01342d60674d6b7"

Initialising tasks...done.
Sstate summary: Wanted 0 Local 0 Network 0 Missed 0 Current 20 (0% match, 100% complete)
NOTE: Executing Tasks
NOTE: Tasks Summary: Attempted 93 tasks of which 90 didn't need to be rerun and all succeeded.
NOTE: Writing buildhistory
NOTE: Writing buildhistory took: 1 seconds
INFO: Extracting upgraded version source...
WARNING: Command 'git rebase 43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc' failed:
Rebasing (1/1)
error: could not apply 72e30d5... mmc_cmd.c: Use extra braces when initializing subobjects
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 72e30d5... mmc_cmd.c: Use extra braces when initializing subobjects
Auto-merging mmc_cmds.c
CONFLICT (content): Merge conflict in mmc_cmds.c

You will need to resolve conflicts in order to complete the upgrade.
INFO: Using source tree as build directory since that would be the default for this recipe
INFO: Upgraded source extracted to /home/pokybuild/yocto-worker/auh/build/build/build/workspace/sources/mmc-utils
INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/mmc-utils/mmc-utils_git.bb



Please review the attached files for further information and build/update failures.
Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler

Regards,
The Upgrade Helper