Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1574358 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-02-06 05:40 +0100 |
| Last post | 2017-02-06 09:40 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the staging tree with the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-06 05:40 +0100
Re: linux-next: manual merge of the staging tree with the v4l-dvb tree Greg KH <greg@kroah.com> - 2017-02-06 09:40 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-02-06 05:40 +0100 |
| Subject | linux-next: manual merge of the staging tree with the v4l-dvb tree |
| Message-ID | <t7JfP-8sT-1@gated-at.bofh.it> |
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/media/lirc/lirc_parallel.c
between commit:
2933974cbb03 ("[media] staging: lirc_parallel: remove")
from the v4l-dvb tree and commit:
1c5fa1c7dbff ("staging: media: lirc: use new parport device model")
from the staging tree.
Unfortunate ...
I fixed it up (I removed the file) 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
[toc] | [next] | [standalone]
| From | Greg KH <greg@kroah.com> |
|---|---|
| Date | 2017-02-06 09:40 +0100 |
| Subject | Re: linux-next: manual merge of the staging tree with the v4l-dvb tree |
| Message-ID | <t7N05-2rC-7@gated-at.bofh.it> |
| In reply to | #1574358 |
On Mon, Feb 06, 2017 at 03:31:51PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/media/lirc/lirc_parallel.c
>
> between commit:
>
> 2933974cbb03 ("[media] staging: lirc_parallel: remove")
>
> from the v4l-dvb tree and commit:
>
> 1c5fa1c7dbff ("staging: media: lirc: use new parport device model")
>
> from the staging tree.
>
> Unfortunate ...
That's fine, thanks for letting me know, I didn't realize the file was
removed until after I had applied the patch :(
thanks,
greg k-h
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web