Messages in this thread | | | Date | Mon, 23 Jan 2012 16:05:46 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the crypto tree with the tegra tree |
| |
Hi Olof,
On Sun, 22 Jan 2012 20:24:16 -0800 Olof Johansson <olof@lixom.net> wrote: > > I should cherry-pick in the same change as Herbert is carrying, and do > the rest of the fuse changes on top of that. I'll do that for > tomorrows -next.
Only if its going to get much worse or you need the change. The conflict is trivial ...
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |