Re: linux-next: manual merge of the v4l-dvb-next tree with the vfs tree

Hi Mauro, On Thu, 14 Dec 2017 14:19:13 -0200 Mauro Carvalho Chehab wrote: > > FYI, > > I had to rebase the patch series on the top of media tree. > > You'll likely be facing the same conflicts with vfs after the > rebase, with different changeset identifiers. Thanks for letting me know ... it

Re: linux-next: manual merge of the v4l-dvb-next tree with the vfs tree

Hi Stephen, Em Mon, 11 Dec 2017 11:28:54 +1100 Stephen Rothwell escreveu: > Hi Mauro, > > Today's linux-next merge of the v4l-dvb-next tree got a conflict in: > > drivers/staging/media/lirc/lirc_zilog.c > > between commit: > > c23e0cb81e40 ("media: annotate ->poll() instances") > > from

linux-next: manual merge of the v4l-dvb-next tree with the vfs tree

Hi Mauro, Today's linux-next merge of the v4l-dvb-next tree got a conflict in: drivers/staging/media/lirc/lirc_zilog.c between commit: c23e0cb81e40 ("media: annotate ->poll() instances") from the vfs tree and commit: 28032a347ed0 ("media: staging: remove lirc_zilog driver") from the v4

linux-next: manual merge of the v4l-dvb-next tree with the vfs tree

Hi Mauro, Today's linux-next merge of the v4l-dvb-next tree got a conflict in: include/media/lirc_dev.h between commit: c23e0cb81e40 ("media: annotate ->poll() instances") from the vfs tree and various commits from the v4l-dvb-next tree. I fixed it up (I just removed the file) and can car

linux-next: manual merge of the v4l-dvb-next tree with the vfs tree

Hi Mauro, Today's linux-next merge of the v4l-dvb-next tree got a conflict in: drivers/media/rc/lirc_dev.c between commit: c23e0cb81e40 ("media: annotate ->poll() instances") from the vfs tree and various commits from the v4l-dvb-next tree. I fixed it up (see below) and can carry the fix