-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08/28/2013 02:19 AM, Masahiro Yamada wrote: > Hello, Tom. > > I noticed this patch does not apply to the current u-boot/master > because commit 3aa29de0 modified the same part. > (BTW, I think CONFIG_TPL_PAD_TO is not necessary either and should be > deleted.) > > Should I need to post version 2 which is rebased on the current master? > (if my patch deserves that, of course.) > > Or are you going to resolve the conflict? > > The conflict dons not seem so comprecated.
I could fix it up, but yes, if you can submit a v2 that would make life easier. Thanks! And you can whack CONFIG_TPL_PAD_TO if not needed really while at it. - -- Tom -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSIQoNAAoJENk4IS6UOR1W7UoP/R6Mywm9L5vBv3KRlbJNKtSI N8/xZ4KyrrQ8qocnw6iEAX2y1YFGTLZ7zpunuwoZwZr/R/RLGaVbgcXobuEu977X /WI+5gUY1W8mlA0YyjRqf2f1ILZqkYmbWIBMrym6aArbqWpeEZ8+tkFYvBmq7GmJ Cok3cCV/t0wJ8wCFCyg2K+s627OMR01ReLrVKM4LsoRLF3MUdx3aPIGUdDBQEdi/ UubHk0vjW8BA/Mte7aFzm8CVuPfBtGom9i30p5xUw/M74+b+moJyPkWX/xM+V+8N dvY2zS5nYU1vxqbwlpQRouPEB8z8XcRIawayYWWUI3HPxS4iBkEzrSM6jiPCspSR I9HKxoiYUN1H/rh/Gw9z45vondlCSSxOj99EraP8pnjbEAoZnSqDceftXtmZN4NW scxEKYE20Cv7C8kuVnN5jtiksYypLJEoQM5TBImSijc2zPA9zEOHQiT35Q3RSAAh hjw6X8WrFpLpLIidfIqlGWghrwxm7QB1UrvYSjnVmzjd+/sYwszYYSQbR/aAw52w ib+d6qWLr8sfX6naT3bXD6BV2QBrnpUGTV+OvygE6cgmozg6Cu5roOQyr41E/2s9 oAstyv5FoI5zd6UO050VHqns06sXZTJ2Og8TQ9scThElYT7JPFPQABLcKc6DBian arXgTZrKOdIW0YoPkOCe =32gD -----END PGP SIGNATURE----- _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
