Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1617481

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

Show all headers | View raw

Hi all,

Today's linux-next merge of the staging tree got conflicts in:

  drivers/staging/media/lirc/lirc_sasem.c
  drivers/staging/media/lirc/lirc_sir.c

between commits:

  e66267161971 ("[media] rc: promote lirc_sir out of staging")
  51bb3fd788cb ("[media] staging: lirc_sasem: remove")

from the v4l-dvb tree and commit:

  87ddb91067b9 ("Staging: media: lirc - style fix")

from the staging tree.

I fixed it up (I removed both files - the updates to lirc_sir.c were
also done in the v4l-dvb tree) 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the staging tree with the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-06 05:40 +0200
  Re: linux-next: manual merge of the staging tree with the v4l-dvb  tree Sean Young <sean@mess.org> - 2017-04-06 21:10 +0200
    Re: linux-next: manual merge of the staging tree with the v4l-dvb  tree Greg KH <greg@kroah.com> - 2017-04-06 21:30 +0200
      Re: linux-next: manual merge of the staging tree with the v4l-dvb  tree Sean Young <sean@mess.org> - 2017-04-06 22:40 +0200
        Re: linux-next: manual merge of the staging tree with the v4l-dvb  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-07 00:00 +0200

csiph-web