Messages in this thread | | | Date | Wed, 24 Sep 2014 15:38:57 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the audit tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in arch/x86/kernel/entry_64.S between commit b4f0d3755c5e ("audit: x86: drop arch from __audit_syscall_entry() interface") from the audit tree and commit 1dcf74f6edfc ("x86_64, entry: Use split-phase syscall_trace_enter for 64-bit syscalls") from the tip tree.
I fixed it up (probably incorrectly - I removed the auditsys section as that is what the latter did) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |