Messages in this thread | ![/](/images/icornerl.gif) | | Date | Thu, 19 Mar 2020 09:30:18 +0100 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the v4l-dvb tree |
| |
On Thu, Mar 19, 2020 at 02:44:11PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/staging/media/allegro-dvt/allegro-core.c > > between commit: > > cc62c74749a3 ("media: allegro: add missed checks in allegro_open()") > > from the v4l-dvb tree and commit: > > e3d21cbfa978 ("staging: media: allegro: align with parenthesis") > > 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.
Fix looks good, thanks!
greg k-h
| ![\](/images/icornerr.gif) |