On 09/24/2012 09:46 AM, Olof Johansson wrote: > On Mon, Sep 24, 2012 at 9:07 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: >> Hi Randy, >> >> On Mon, 24 Sep 2012 08:39:05 -0700 Randy Dunlap <rdunlap@xxxxxxxxxxxx> wrote: >>> >>> On 09/24/2012 07:53 AM, Stephen Rothwell wrote: >>> >>>> Today was a train wreck, with lots of new conflicts across several trees >>>> and a few build failures as well. >>> >>> I agree. I mostly get this: >>> >>> drivers/Kconfig:157: can't open file "drivers/irqchip/Kconfig" >>> >>> i.e., no such file. >>> >>> How does this happen? :( >>> >>> who handles irqchip? >> >> Hmm, commit 89214f009c1d ("ARM: bcm2835: add interrupt controller >> driver") from the arm-soc tree adds that file as an empty file (I have >> the empty file in my tree). Nothing adds anything to it. > > Yeah, the directory came in through arm-soc for-next (since the > bcm2835 driver was added), but there is an empty Kconfig in arm-soc. I > can see it in linux-next as well. > > I wonder why it doesn't show up in your tree, Randy. You just did a > regular git checkout? Sorry for the very delayed reply (and this is already fixed). It doesn't show up in my kernel tree because I use linux-v3.x tarballs and patch-3.x-rcY patches and linux-next patches, and 'patch' does not keep empty files around. -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html