[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120104104758.26b0ca5268d10fbf7b95903a@canb.auug.org.au>
Date: Wed, 4 Jan 2012 10:47:58 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
<linux-arm-kernel@...ts.infradead.org>,
Mauro Carvalho Chehab <mchehab@...radead.org>,
Vinod Koul <vinod.koul@...el.com>,
Linus <torvalds@...ux-foundation.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: interesting merges in the arm-soc tree
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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists