From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>,
Mauro Carvalho Chehab <mchehab@osg•samsung.com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Derek Robson <robsonde@gmail•com>, Sean Young <sean@mess•org>
Subject: linux-next: manual merge of the staging tree with the v4l-dvb tree
Date: Thu, 6 Apr 2017 13:34:20 +1000 [thread overview]
Message-ID: <20170406133420.3e231d2a@canb.auug.org.au> (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
next reply other threads:[~2017-04-06 3:34 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-06 3:34 Stephen Rothwell [this message]
2017-04-06 18:58 ` linux-next: manual merge of the staging tree with the v4l-dvb tree Sean Young
2017-04-06 19:19 ` Greg KH
2017-04-06 20:39 ` Sean Young
2017-04-06 21:51 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-10-16 3:18 Stephen Rothwell
2024-10-16 5:48 ` Greg KH
2023-02-13 2:13 Stephen Rothwell
2023-02-13 7:05 ` Greg KH
2020-03-23 4:18 Stephen Rothwell
2020-03-23 9:56 ` Greg KH
2020-03-19 3:44 Stephen Rothwell
2020-03-19 8:30 ` Greg KH
2019-04-26 6:06 Stephen Rothwell
2019-04-27 6:36 ` Greg KH
2019-05-08 1:54 ` Stephen Rothwell
2019-04-04 2:43 Stephen Rothwell
2018-12-10 5:53 Stephen Rothwell
2018-10-08 4:53 Stephen Rothwell
2018-10-08 4:47 Stephen Rothwell
2018-05-17 4:17 Stephen Rothwell
2018-05-17 7:22 ` Greg KH
2018-05-17 10:06 ` Mauro Carvalho Chehab
2018-05-26 4:45 ` Stephen Rothwell
2017-11-02 4:30 Stephen Rothwell
2017-04-11 3:32 Stephen Rothwell
2017-02-06 4:31 Stephen Rothwell
2017-02-06 8:37 ` Greg KH
2016-03-04 5:24 Stephen Rothwell
2016-03-04 16:58 ` Greg KH
2015-05-11 5:28 Stephen Rothwell
2015-05-11 18:34 ` Greg KH
2015-03-24 5:29 Stephen Rothwell
2014-11-24 8:10 Stephen Rothwell
2014-11-24 8:09 Stephen Rothwell
2014-11-05 4:37 Stephen Rothwell
2014-11-05 4:31 Stephen Rothwell
2014-11-05 4:29 Stephen Rothwell
2014-11-06 2:19 ` Greg KH
2014-07-16 6:46 Stephen Rothwell
2014-07-16 20:52 ` Greg KH
2014-03-18 6:15 Stephen Rothwell
2014-03-17 7:55 Stephen Rothwell
2014-03-17 11:01 ` Mauro Carvalho Chehab
2014-03-17 18:29 ` Greg KH
[not found] ` < 20140317162937.2ccdec83@infradead.org>
2014-03-17 19:29 ` Mauro Carvalho Chehab
2014-03-17 22:27 ` Russell King
2014-03-19 15:30 ` Greg KH
2014-03-21 12:24 ` Grant Likely
2014-03-21 14:37 ` Grant Likely
2011-09-27 6:10 Stephen Rothwell
2011-09-27 14:18 ` Greg KH
2011-09-27 20:14 ` Paul Gortmaker
2011-07-16 13:03 Stephen Rothwell
2011-07-17 9:15 ` Greg KH
2011-03-04 5:39 Stephen Rothwell
2011-03-04 17:14 ` Greg KH
2011-03-04 5:39 Stephen Rothwell
2011-03-04 17:14 ` Greg KH
2011-03-04 5:39 Stephen Rothwell
2011-03-04 17:13 ` Greg KH
2011-03-04 17:54 ` Mauro Carvalho Chehab
2011-03-04 21:23 ` Greg KH
2011-03-04 22:17 ` Mauro Carvalho Chehab
2011-03-04 5:38 Stephen Rothwell
2011-03-04 17:12 ` Greg KH
2011-03-04 5:38 Stephen Rothwell
2011-03-04 17:13 ` Greg KH
2011-03-04 5:38 Stephen Rothwell
2011-03-04 17:12 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170406133420.3e231d2a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@osg$(echo .)samsung.com \
--cc=robsonde@gmail$(echo .)com \
--cc=sean@mess$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox