Message ID | 55E6C7F9.1010300@denx.de |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On Wed, Sep 02, 2015 at 11:57:13AM +0200, Stefano Babic wrote: > Hi Tom, > > please pull from u-boot-imx, thanks ! > > The following changes since commit e3d50d4292ebabdf61f56f3a633cdb3a1e58bf88: > > fsl_esdhc.c: Always make check_and_invalidate_dcache_range available > (2015-08-02 10:27:52 -0400) That's actually really old and I get a few non-trivial conflicts. Can you please rebase on master? Thanks!
Hi Tom, On 02/09/2015 15:18, Tom Rini wrote: > On Wed, Sep 02, 2015 at 11:57:13AM +0200, Stefano Babic wrote: > >> Hi Tom, >> >> please pull from u-boot-imx, thanks ! >> >> The following changes since commit e3d50d4292ebabdf61f56f3a633cdb3a1e58bf88: >> >> fsl_esdhc.c: Always make check_and_invalidate_dcache_range available >> (2015-08-02 10:27:52 -0400) > > That's actually really old and I get a few non-trivial conflicts. Can > you please rebase on master? Thanks! You're right - I am solving conflicts and I will send a new PR afterward. Stefano
Hi Tom, On 02/09/2015 15:45, Stefano Babic wrote: > Hi Tom, > > On 02/09/2015 15:18, Tom Rini wrote: >> On Wed, Sep 02, 2015 at 11:57:13AM +0200, Stefano Babic wrote: >> >>> Hi Tom, >>> >>> please pull from u-boot-imx, thanks ! >>> >>> The following changes since commit e3d50d4292ebabdf61f56f3a633cdb3a1e58bf88: >>> >>> fsl_esdhc.c: Always make check_and_invalidate_dcache_range available >>> (2015-08-02 10:27:52 -0400) >> >> That's actually really old and I get a few non-trivial conflicts. Can >> you please rebase on master? Thanks! > > You're right - I am solving conflicts and I will send a new PR afterward. > Conflicts are solved - I had to rebase, sorry for that! Can you try again to take my PR ? Regards, Stefano
On Wed, Sep 02, 2015 at 04:12:18PM +0200, Stefano Babic wrote: > Hi Tom, > > On 02/09/2015 15:45, Stefano Babic wrote: > > Hi Tom, > > > > On 02/09/2015 15:18, Tom Rini wrote: > >> On Wed, Sep 02, 2015 at 11:57:13AM +0200, Stefano Babic wrote: > >> > >>> Hi Tom, > >>> > >>> please pull from u-boot-imx, thanks ! > >>> > >>> The following changes since commit e3d50d4292ebabdf61f56f3a633cdb3a1e58bf88: > >>> > >>> fsl_esdhc.c: Always make check_and_invalidate_dcache_range available > >>> (2015-08-02 10:27:52 -0400) > >> > >> That's actually really old and I get a few non-trivial conflicts. Can > >> you please rebase on master? Thanks! > > > > You're right - I am solving conflicts and I will send a new PR afterward. > > > > Conflicts are solved - I had to rebase, sorry for that! > > Can you try again to take my PR ? Applied to u-boot/master, thanks!