Messages in this thread | | | Date | Tue, 2 Oct 2012 11:51:17 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in Documentation/feature-removal-schedule.txt between commit 9c0ece069b32 ("Get rid of Documentation/feature-removal.txt") from Linus' tree and commits 965505015bec ("netfilter: remove xt_NOTRACK") and 7b55279f6a45 ("NFC: Remove the pn544 raw driver") from the net-next tree.
I removed the file 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] | |