Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> writes: > On Sat, Mar 30, 2013 at 02:46:28AM +0200, Alexander Shishkin wrote: >> From: Michael Grzeschik <m.grzeschik@xxxxxxxxxxxxxx> >> >> This driver will be used for every Freescale SoC which has this misc >> memory layout to control the basic usb handling. So better name this >> driver, function and struct names in a more generic way. >> >> Reported-by: Fabio Estevam <festevam@xxxxxxxxx> >> Signed-off-by: Michael Grzeschik <m.grzeschik@xxxxxxxxxxxxxx> >> Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> >> Signed-off-by: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx> >> >> Conflicts: >> drivers/usb/chipidea/usbmisc_imx.c > > What does this mean? Why are these two lines in the changelog area? The patch that was sent to me didn't apply, so I had to fix it. > Hint, be more careful when using git rebase, and double check what you > send me, before you send it. I always do, I just didn't realize it was a problem to have conflicts in changelog, since there are other non-merge commits in the tree like that. Regards, -- Alex -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
