Hi Rusty, On Mon, 06 May 2013 14:59:05 +0930 Rusty Russell <[email protected]> wrote: > > Stephen Rothwell <[email protected]> writes: > > Version from today's merge fix. Rusty, you should show this to Linus > > when you ask him to merge your modules tree (assuming it looks right :-)). > > > > From: Stephen Rothwell <[email protected]> > > Date: Thu, 14 Mar 2013 17:14:41 +1100 > > Subject: [PATCH] cond_syscall and SYSCALL_ALIAS merge fixup > > > > Signed-off-by: Stephen Rothwell <[email protected]> > > I ended up with something similar, except I didn't remove > linux/stringify.h from the includes.
Well, the stringify include was only added in Al's patch during this merge window, so it should be perfectly safe to remove again (now that all the "stringify" calls have been removed again). -- Cheers, Stephen Rothwell [email protected]
pgpwiiuUF0UgJ.pgp
Description: PGP signature

