[meta-security] master-next rebased?

[meta-security] master-next rebased?

[Patrick Ohly]

Hello Armin!

Did you accidentally rebase all of master-next?

The current master-next tip (3b9dd3688b6c725aa0146c91ee1a58c26095e48d)
isn't rooted in the current master
(8b38c93f2387793fb03d082e47723002cf667ae9) anymore:

$ git branch -r --contains origin/master-next 
  origin/master-next
$ git log --oneline origin/master..origin/master-next  | wc -l
179
$ git log --oneline origin/master  | wc -l
211

Looking at the content, it seems that only the last two commits in
master-next are actually new ;-}

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.

Re: [meta-security] master-next rebased?

[akuster808]

On 03/24/2017 01:44 AM, Patrick Ohly wrote:
> Hello Armin!
>
> Did you accidentally rebase all of master-next?
looks like it.
>
> The current master-next tip (3b9dd3688b6c725aa0146c91ee1a58c26095e48d)
> isn't rooted in the current master
> (8b38c93f2387793fb03d082e47723002cf667ae9) anymore:
>
> $ git branch -r --contains origin/master-next
>    origin/master-next
> $ git log --oneline origin/master..origin/master-next  | wc -l
> 179
> $ git log --oneline origin/master  | wc -l
> 211
>
> Looking at the content, it seems that only the last two commits in
> master-next are actually new ;-}
correcting it now.

thanks.
-armin
>