On Tue, 2018-01-09 at 16:02 +1100, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm tree got a conflict in: > > arch/x86/platform/intel-mid/device_libs/platform_bt.c > > between commit: > > 9d0513d82f1a ("x86/platform/intel-mid: Revert "Make 'bt_sfi_data' > const"") > > from the tip tree and patch: > > "arch/x86/platform/intel-mid/device_libs/platform_bt.c: fix const > confusion" > > from the akpm tree. > > I fixed it up (I dropped the akpm tree patch) Yes, that is exactly what needs to be done. Thanks! Andrew, can you drop that patch from your quilt? > 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. > -- Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Intel Finland Oy -- 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