Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in fs/Kconfig
between commit c417122fec0f6b10a6c338c84180c6b9e06601c8 ("quota: Move
quota files into separate directory") from the quota tree and commit
8310459012b926e121b3546bfed833910dd6f3ef ("trivial: fix typos/grammar
errors in Kconfig texts") from the trivial tree.
I have just dropped the trivial tree's updates. Jiri, please separate
out the fs/Kconfig part of that trivial tree commit above and sent it to
Jan.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpWtsfsD3Evj.pgp
Description: PGP signature
