linux-kernel - linux-next: manual merge of the orangefs tree with Linus' tree

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>] [day] [month] [year] [list]

Date:	Mon, 21 Dec 2015 10:31:06 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mike Marshall <hubcap@...ibond.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the orangefs tree with Linus' tree

Hi Mike,

Today's linux-next merge of the orangefs tree got a conflict in:

  Makefile

between commit:

  1ec218373b8e ("Linux 4.4-rc2")

from Linus' tree and commit:

  575e946125f7 ("Orangefs: change pvfs2 filenames to orangefs")

from the orangefs tree.

You should really remove this EXTRAVERSION change from the patch.

I fixed it up (I use Linus' tree verison) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/