Hi all, Today's linux-next merge of the staging tree got conflicts in: drivers/staging/Kconfig drivers/staging/Makefile between commits: 955315b0dc8c ("qlge: Move drivers/net/ethernet/qlogic/qlge/ to drivers/staging/qlge/") 71ed79b0e4be ("USB: Move wusbcore and UWB to staging as it is obsolete") from the net-next and usb trees and commit: c48c9f7ff32b ("staging: exfat: add exfat filesystem code to staging") from the staging tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/staging/Kconfig index fc1420f2a949,fbdc33874780..000000000000 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@@ -120,9 -118,6 +118,11 @@@ source "drivers/staging/kpc2000/Kconfig source "drivers/staging/isdn/Kconfig" +source "drivers/staging/qlge/Kconfig" + +source "drivers/staging/wusbcore/Kconfig" +source "drivers/staging/uwb/Kconfig" + + source "drivers/staging/exfat/Kconfig" + endif # STAGING diff --cc drivers/staging/Makefile index b08ab677e49b,ca13f87b1e1b..000000000000 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@@ -49,7 -49,4 +49,7 @@@ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fif obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ obj-$(CONFIG_KPC2000) += kpc2000/ obj-$(CONFIG_ISDN_CAPI) += isdn/ +obj-$(CONFIG_QLGE) += qlge/ +obj-$(CONFIG_UWB) += uwb/ +obj-$(CONFIG_USB_WUSB) += wusbcore/ + obj-$(CONFIG_EXFAT_FS) += exfat/
Attachment:
pgpBuros9q0nc.pgp
Description: OpenPGP digital signature