linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL for v5.2] Venus updates - take2
@ 2019-04-23 14:07 Stanimir Varbanov
  2019-04-25 14:46 ` Mauro Carvalho Chehab
  0 siblings, 1 reply; 3+ messages in thread
From: Stanimir Varbanov @ 2019-04-23 14:07 UTC (permalink / raw)
  To: linux-media

Hi Mauro,

Here is the second attempt.

Added two more fixes for Venus v4 properties and dynamic buffer mode.

Please pull.

The following changes since commit 26d5d1fe53e966efe567e9773d1158baef303e3b:

  venus: helpers: fix dynamic buffer mode for v4 (2019-04-23 15:57:17 +0300)

are available in the Git repository at:

  git://linuxtv.org/svarbanov/media_tree.git tags/venus-for-5.2-take2

for you to fetch changes up to 26d5d1fe53e966efe567e9773d1158baef303e3b:

  venus: helpers: fix dynamic buffer mode for v4 (2019-04-23 15:57:17 +0300)

----------------------------------------------------------------
Venus updates for v5.2

----------------------------------------------------------------

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [GIT PULL for v5.2] Venus updates - take2
  2019-04-23 14:07 [GIT PULL for v5.2] Venus updates - take2 Stanimir Varbanov
@ 2019-04-25 14:46 ` Mauro Carvalho Chehab
  2019-04-25 14:55   ` Mauro Carvalho Chehab
  0 siblings, 1 reply; 3+ messages in thread
From: Mauro Carvalho Chehab @ 2019-04-25 14:46 UTC (permalink / raw)
  To: Stanimir Varbanov; +Cc: linux-media

Em Tue, 23 Apr 2019 17:07:02 +0300
Stanimir Varbanov <stanimir.varbanov@linaro.org> escreveu:

> Hi Mauro,
> 
> Here is the second attempt.
> 
> Added two more fixes for Venus v4 properties and dynamic buffer mode.
> 
> Please pull.
> 
> The following changes since commit 26d5d1fe53e966efe567e9773d1158baef303e3b:
> 
>   venus: helpers: fix dynamic buffer mode for v4 (2019-04-23 15:57:17 +0300)
> 
> are available in the Git repository at:
> 
>   git://linuxtv.org/svarbanov/media_tree.git tags/venus-for-5.2-take2
> 
> for you to fetch changes up to 26d5d1fe53e966efe567e9773d1158baef303e3b:
> 
>   venus: helpers: fix dynamic buffer mode for v4 (2019-04-23 15:57:17 +0300)
> 
> ----------------------------------------------------------------
> Venus updates for v5.2
> 
> ----------------------------------------------------------------

There's something really weird here... It should be showing above the
patches applied to your tree, but, instead, it doesn't show any
patch on the above summary. It is like your tree doesn't contain
any new patch, just the stuff that were already merged on my
tree.

I suspect that you're passing some weird argument to 
git pull-request, as it is saying:

> The following changes since commit 26d5d1fe53e966efe567e9773d1158baef303e3b:
				     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> for you to fetch changes up to 26d5d1fe53e966efe567e9773d1158baef303e3b:
				 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

See?

It is requesting me to pull an empty set of patches, as the git
reference is identical! There's not between 26d5d1fe5..26d5d1fe5!!!

As my import script uses those references, it gets an empty number of
patches to merge.


Thanks,
Mauro

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [GIT PULL for v5.2] Venus updates - take2
  2019-04-25 14:46 ` Mauro Carvalho Chehab
@ 2019-04-25 14:55   ` Mauro Carvalho Chehab
  0 siblings, 0 replies; 3+ messages in thread
From: Mauro Carvalho Chehab @ 2019-04-25 14:55 UTC (permalink / raw)
  To: Stanimir Varbanov; +Cc: linux-media

Em Thu, 25 Apr 2019 11:46:18 -0300
Mauro Carvalho Chehab <mchehab+samsung@kernel.org> escreveu:

> Em Tue, 23 Apr 2019 17:07:02 +0300
> Stanimir Varbanov <stanimir.varbanov@linaro.org> escreveu:
> 
> > Hi Mauro,
> > 
> > Here is the second attempt.
> > 
> > Added two more fixes for Venus v4 properties and dynamic buffer mode.
> > 
> > Please pull.
> > 
> > The following changes since commit 26d5d1fe53e966efe567e9773d1158baef303e3b:
> > 
> >   venus: helpers: fix dynamic buffer mode for v4 (2019-04-23 15:57:17 +0300)
> > 
> > are available in the Git repository at:
> > 
> >   git://linuxtv.org/svarbanov/media_tree.git tags/venus-for-5.2-take2
> > 
> > for you to fetch changes up to 26d5d1fe53e966efe567e9773d1158baef303e3b:
> > 
> >   venus: helpers: fix dynamic buffer mode for v4 (2019-04-23 15:57:17 +0300)
> > 
> > ----------------------------------------------------------------
> > Venus updates for v5.2
> > 
> > ----------------------------------------------------------------
> 
> There's something really weird here... It should be showing above the
> patches applied to your tree, but, instead, it doesn't show any
> patch on the above summary. It is like your tree doesn't contain
> any new patch, just the stuff that were already merged on my
> tree.
> 
> I suspect that you're passing some weird argument to 
> git pull-request, as it is saying:
> 
> > The following changes since commit 26d5d1fe53e966efe567e9773d1158baef303e3b:
> 				     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> > for you to fetch changes up to 26d5d1fe53e966efe567e9773d1158baef303e3b:
> 				 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> 
> See?
> 
> It is requesting me to pull an empty set of patches, as the git
> reference is identical! There's not between 26d5d1fe5..26d5d1fe5!!!
> 
> As my import script uses those references, it gets an empty number of
> patches to merge.

FYI, what I use here when sending my stuff upstream patches is:

	ORIGIN=$(git merge-base remotes/origin/master $(git branch|grep '*'|cut -b 3-))
	git request-pull $ORIGIN $URL 

Except if you do some unusual things (like sometimes I do), you can
probably just use:

	git request-pull origin/master $URL

where $URL is the URL for the tree you're sending the pull request - in
this case, the URL for my tree at linuxtv.org, e. g.

URL=git://linuxtv.org/media_tree.git

Thanks,
Mauro

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-04-25 14:56 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-23 14:07 [GIT PULL for v5.2] Venus updates - take2 Stanimir Varbanov
2019-04-25 14:46 ` Mauro Carvalho Chehab
2019-04-25 14:55   ` Mauro Carvalho Chehab

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).