Hi all, I noticed that the arm-soc tree has merged in the v4l-dvb and the slave-dma trees today. Is there some good reason for this? It fixes a few conflicts (but that is not excuse) and there may be dependencies in a driver on the v4l-dvb tree (but maybe that means that that driver should be merged via the v4l-dvb tree - it looks like the "at91/drivers" is based on the v4l-dvb tree, so probably doesn't depend on anything else on the arm-soc tree). If nothing else, are you sure that neither of those merged trees will rebase? You have also just inherited any bugs in those two trees. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpe5eFUH_UmA.pgp
Description: PGP signature
