On Fri, Feb 15, 2013 at 04:01:24PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/net/wireless/rtlwifi/Kconfig between commit 06e7cda3ce30 > ("rtlwifi: Rework Kconfig") from the wireless-next tree and commit > 6cba014857f4 ("drivers/net/wireless/rtlwifi: remove depends on > CONFIG_EXPERIMENTAL") from the driver-core tree. > > I fixed it up (the former is a superset of the latter, so I used that) > and can carry the fix as necessary (no action is required). That sounds fine, thanks. greg k-h -- 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