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]
Message-Id: <20110318103444.f3ff064e.sfr@canb.auug.org.au>
Date:	Fri, 18 Mar 2011 10:34:44 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Chris Metcalf <cmetcalf@...era.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tejun Heo <tj@...nel.org>
Subject: linux-next: manual merge of the tile tree with Linus' tree

Hi Chris,

Today's linux-next merge of the tile tree got a conflict in
arch/tile/kernel/vmlinux.lds.S between commit 19df0c2fef01 ("percpu:
align percpu readmostly subsection to cacheline") from Linus' tree and
commit 2cb82400719e ("arch/tile: catch up with section naming convention
in 2.6.35") from the tile tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/tile/kernel/vmlinux.lds.S
index c6ce378,4e211c1..0000000
--- a/arch/tile/kernel/vmlinux.lds.S
+++ b/arch/tile/kernel/vmlinux.lds.S
@@@ -59,11 -59,8 +59,8 @@@ SECTION
  
    . = ALIGN(PAGE_SIZE);
    VMLINUX_SYMBOL(_sinitdata) = .;
-   .init.page : AT (ADDR(.init.page) - LOAD_OFFSET) {
-     *(.init.page)
-   } :data =0
-   INIT_DATA_SECTION(16)
+   INIT_DATA_SECTION(16) :data =0
 -  PERCPU(PAGE_SIZE)
 +  PERCPU(L2_CACHE_BYTES, PAGE_SIZE)
    . = ALIGN(PAGE_SIZE);
    VMLINUX_SYMBOL(_einitdata) = .;
  
--
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/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ