* linux-next: please clean up the v4l-dvb-next tree @ 2019-02-19 23:57 Stephen Rothwell 2019-02-20 0:10 ` Mauro Carvalho Chehab 0 siblings, 1 reply; 3+ messages in thread From: Stephen Rothwell @ 2019-02-19 23:57 UTC (permalink / raw) To: Mauro Carvalho Chehab; +Cc: Linux Next Mailing List, Linux Kernel Mailing List [-- Attachment #1: Type: text/plain, Size: 229 bytes --] Hi Mauro, It seems most (if not all) of the commits in the v4l-dvb-next tree are also in the v4l-dvb tree and are now causing lots of conflicts when I merge them both. Please clean it up. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: please clean up the v4l-dvb-next tree 2019-02-19 23:57 linux-next: please clean up the v4l-dvb-next tree Stephen Rothwell @ 2019-02-20 0:10 ` Mauro Carvalho Chehab 2019-02-20 0:21 ` Stephen Rothwell 0 siblings, 1 reply; 3+ messages in thread From: Mauro Carvalho Chehab @ 2019-02-20 0:10 UTC (permalink / raw) To: Stephen Rothwell; +Cc: Linux Next Mailing List, Linux Kernel Mailing List Em Wed, 20 Feb 2019 10:57:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> escreveu: > Hi Mauro, > > It seems most (if not all) of the commits in the v4l-dvb-next tree are > also in the v4l-dvb tree and are now causing lots of conflicts when I > merge them both. Please clean it up. > Yeah, it had some branches that got already merged. Just updated it to be in sync with v4l-dvb tree. Sorry for the mess. Thanks, Mauro ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: please clean up the v4l-dvb-next tree 2019-02-20 0:10 ` Mauro Carvalho Chehab @ 2019-02-20 0:21 ` Stephen Rothwell 0 siblings, 0 replies; 3+ messages in thread From: Stephen Rothwell @ 2019-02-20 0:21 UTC (permalink / raw) To: Mauro Carvalho Chehab; +Cc: Linux Next Mailing List, Linux Kernel Mailing List [-- Attachment #1: Type: text/plain, Size: 300 bytes --] Hi Mauro, On Tue, 19 Feb 2019 21:10:33 -0300 Mauro Carvalho Chehab <mchehab@kernel.org> wrote: > > Yeah, it had some branches that got already merged. > > Just updated it to be in sync with v4l-dvb tree. > > Sorry for the mess. No worries and thanks. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-20 0:21 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-02-19 23:57 linux-next: please clean up the v4l-dvb-next tree Stephen Rothwell 2019-02-20 0:10 ` Mauro Carvalho Chehab 2019-02-20 0:21 ` Stephen Rothwell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox