Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/drm_proc.c between commit
804852e4ffc983f9ee7600f78218698546fdc58d ("drm_proc.c fix compilation
warning") from the x86 tree and commit
a584bb1ed4de35a9206a8ed42fc7de18b3d46b5a ("drm: Convert proc files to
seq_file and introduce debugfs") from the drm tree.
The former fixed a warning in code removed by the latter. I just dropped
the former change.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpiXYgWjm7yL.pgp
Description: PGP signature
