On Fri, 2012-11-30 at 11:10 +0100, Rik Theys wrote: [...] > I cherry picked commits 5ef30ee53b187786e64bdc1f8109e39d17f2ce58 and > 5195d8e217a78697152d64fc09a16e063a022465 and tried to compile the > result, but it failed with the following error: > > kernel/auditsc.c:2189: error: conflicting types for ‘__audit_mq_open’ > include/linux/audit.h:477: note: previous declaration of > ‘__audit_mq_open’ was here > kernel/auditsc.c:2289: error: conflicting types for ‘__audit_ipc_set_perm’ > include/linux/audit.h:471: note: previous declaration of > ‘__audit_ipc_set_perm’ was here > > Any idea on how to determine which intermediate patches are also needed? > Or should I just try to modify commit > 5195d8e217a78697152d64fc09a16e063a022465 to make it apply? It is not too difficult to fix up the conflicts. But this is a fairly big change, so I think this bug should now be 'wontfix' for wheezy. Sorry we didn't get it fixed earlier. Ben. -- Ben Hutchings Never attribute to conspiracy what can adequately be explained by stupidity.
Attachment:
signature.asc
Description: This is a digitally signed message part