Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
drivers/firmware/dcdbas.c between commit
c90e785be2fd9dfaef1f030d0314e44052553736 ("cpumask: use cpumask_var_t in
dcdbas.c") from the x86 and cpus4096 trees and commit
d4e7753fce670a269f55d4b7cafe9d3e77d7d26f (misc:work_on_cpu-dcdbas"") from
the rr tree.
It appears that the former patch is effectively replaced by the latter.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpupxbkdT5ot.pgp
Description: PGP signature
