Hi Stephen, On Monday 28 February 2011 07:40:07 Stephen Rothwell wrote: > Today's linux-next merge of the bkl-config tree got a conflict in > drivers/staging/Kconfig between commits > 4a6514e6d096716fb7bedf238efaaca877e2a7e8 ("tty: move obsolete and broken > tty drivers to drivers/staging/tty/") and > 4c37705877e74c02c968735c2eee0f84914cf557 ("tty: move obsolete and broken > generic_serial drivers to drivers/staging/generic_serial/") from the tty > tree and commit a3ba01b63468c925518da2da0ac3be11358f60cb ("BKL: move > CONFIG_BKL to staging") from the bkl-config tree. > > I fixed it up (see below) and can carry the fix as necessary. I have cleared the branch in my repository now, since the contents were very outdated. I have a newer branch named 'final' with all the patches that are needed on top of -next to kill the BKL for good. I'll send the patches out for review again and if everyone is happy, I can update the config branch so they get into -next. Arnd -- 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