On Wed, Jun 17, 2015 at 03:49:13PM +0800, Bian Naimeng wrote: > Signed-off-by: Bian Naimeng <[email protected]> > > git send-email will catch error as below > fatal: 0002-samba-upgrade-to-4.1.12.patch: 965: patch contains a line longer > than 998 characters > > So, please get patch from > https://github.com/bendaaron/meta-oe-dev/commit/47678ed346a1ce347a64705c76df09d4fa537b0e
I've cherry-picked first 6 patches from here, but this last one fails to apply, because you're removing samba 3.6.24, but in master we have 3.6.25 since this commit merged more than month ago: commit 9ac5713b2fcb5ce03693edd40636d8fce3e014d0 Author: Roy Li <[email protected]> AuthorDate: Wed Apr 29 17:25:02 2015 +0800 Commit: Martin Jansa <[email protected]> CommitDate: Mon May 11 10:27:28 2015 +0200 samba: upgrade to 3.6.25 Also this patch only removes 3.6.24, but doesn't add 4.1.12. Please rebase to latest master and fix the last commit. -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
