linux-kernel - Re: [GIT PULL] Staging driver patches for 4.6-rc1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 17 Mar 2016 22:19:04 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Greg KH <gregkh@...uxfoundation.org>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Driver Project <devel@...uxdriverproject.org>
Subject: Re: [GIT PULL] Staging driver patches for 4.6-rc1

On Thu, Mar 17, 2016 at 8:25 PM, Greg KH <gregkh@...uxfoundation.org> wrote:
> Ok, the diffstat below seems "odd" in that I had done a merge with my
> char-misc tree to resolve some merge issues a while ago, and that tree
> is now in your tree, so the diffstat shouldn't be showing it (I updated
> my master branch), but somehow it is.

When there isn't a single well-defined common base for the merge
(which happens when you cross-merge, but also if you have multiple
different bases internally and then merge inside one branch), the "git
diff" output will pick one of the (multiple) common bases, and use
that as the base of the diff.

That usually works fine, but it can also give wildly wrong diffstat
results, simply because the only way to get the final real diff would
be to just do the merge.

> Also, there are a number of conflicts here when merging with your tree.
>         both modified:   drivers/media/dvb-frontends/mn88473.c
>         deleted by them: drivers/staging/dgap/dgap.c
>         both modified:   drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
>         both modified:   drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
>         both modified:   include/linux/irqdomain.h
>
> I can fix these up and resend this with a merged tree pull request if
> you want me to, it's your call.

No, all good. I've already merged it, I'm just waiting for the build
test to finish before pushing out the end result.

You might want to double-check the end result, but nothing looked
particularly odd.

                 Linus