* Re: linux-next: manual merge of the oprofile tree with the tip tree
From: Stephen Rothwell @ 2010-10-12 12:23 UTC (permalink / raw)
To: Matt Fleming
Cc: Robert Richter, linux-next, linux-kernel, Matt Helsley,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
In-Reply-To: <20101012060327.GA13409@console-pimps.org>
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
Hi Matt,
On Tue, 12 Oct 2010 07:03:27 +0100 Matt Fleming <matt@console-pimps.org> wrote:
>
> > return 0;
> >
> > pevent = perf_event_create_kernel_counter(&counter_config[event].attr,
> > - cpu, -1,
> > + cpu, NULL1,
> > op_overflow_handler);
>
> Is that a typo? Shouldn't that be NULL, and not NULL1?
Yes, its a typo in my patch :-( . I will fix it for tomorrow. Sorry about that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the arm tree with the arm-current tree
From: Sascha Hauer @ 2010-10-12 10:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Russell King, linux-next, linux-kernel, Uwe Kleine-König,
Eric Bénard
In-Reply-To: <20101012103314.41b00cbe.sfr@canb.auug.org.au>
On Tue, Oct 12, 2010 at 10:33:14AM +1100, Stephen Rothwell wrote:
> Hi Russell,
>
> Today's linux-next merge of the arm tree got a conflict in
> arch/arm/mach-imx/mach-cpuimx27.c between commit
> 4793ca4028e4dcdbf2740db50995c9378ded3cf8 ("cpuimx27: fix i2c bus
> selection") from the arm-current tree and commit
> 77a406da5a5b76445a816d5f043fc9aef4026ff1 ("ARM: imx: fix name of macros
> to add imx-i2c devices") from the arm tree.
>
> I fixed it up (see below) can can carry the fix for a while.
This is because the imx-for-next branch still contained a patch which
I was hoping to get into 2.6.36. This patch conflicts with another patch
in the 2.6.37 branch (I resolved this manually in my next branch).
As all patches for next are now in Russells branch I just scrubbed
my for-next branch and this merge conflict should be gone now.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply
* Re: linux-next: manual merge of the arm tree with the arm-current tree
From: Uwe Kleine-König @ 2010-10-12 10:02 UTC (permalink / raw)
To: Russell King
Cc: Stephen Rothwell, linux-next, linux-kernel, Sascha Hauer,
Eric Bénard
In-Reply-To: <20101012094208.GD12845@flint.arm.linux.org.uk>
Hi Russell,
On Tue, Oct 12, 2010 at 10:42:08AM +0100, Russell King wrote:
> On Tue, Oct 12, 2010 at 11:23:57AM +0200, Uwe Kleine-König wrote:
> > Hi Russell,
> >
> > On Tue, Oct 12, 2010 at 09:28:14AM +0100, Russell King wrote:
> > > On Tue, Oct 12, 2010 at 10:03:54AM +0200, Uwe Kleine-König wrote:
> > > > On Tue, Oct 12, 2010 at 10:33:14AM +1100, Stephen Rothwell wrote:
> > > > > Hi Russell,
> > > > >
> > > > > Today's linux-next merge of the arm tree got a conflict in
> > > > > arch/arm/mach-imx/mach-cpuimx27.c between commit
> > > > > 4793ca4028e4dcdbf2740db50995c9378ded3cf8 ("cpuimx27: fix i2c bus
> > > > > selection") from the arm-current tree and commit
> > > > > 77a406da5a5b76445a816d5f043fc9aef4026ff1 ("ARM: imx: fix name of macros
> > > > > to add imx-i2c devices") from the arm tree.
> > > A more concerning question is - these recent conflicts have been happening
> > > as a result of merging people's GIT trees, which tend to be sent close
> > > to the merge window.
> > >
> > > If the first time their changes become visible to linux-next is when
> > > they're merged into my tree, something is wrong...
> > I tried to reconstruct that. I guess I cannot see yet that Russell took
> > 4793ca4028e4dcdbf2740db50995c9378ded3cf8 because I have no access to
> > Russell's kernel.org repo and his ftp.arm.linux.org.uk repo currently
> > barfs for me and Stephen didn't push out a tree newer than 20101011 yet.
>
> What's up with it? What URL are you using?
http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/
and it fails for me with
ukl@octopus:~/gsrc/linux-2.6$ git fetch rmk
error: Unable to find 81490fcdf406f42fff9d9f57d541788f90242885 under
http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git
Cannot obtain needed commit 81490fcdf406f42fff9d9f57d541788f90242885
while processing commit d7840ed08bf6f74677a6b2b21b96269180be9eb6.
error: Fetch failed.
I'm trying to reproduce with
git clone --reference ~/gsrc/linux-2.6 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git t
cd t
git remote add -f rmk http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/
... sometime later ...
works, so something in my repo seems to be the problem. I assume a pack
file is corrupt?! Hmm, I'll try to remove all packs I got from your
repo ...
... wget ... sed $magic ... rm $(cat filelist)
ukl@octopus:~/gsrc/linux-2.6$ git fetch rmk
+ 86c4743...74a4333 devel -> rmk/devel (forced update)
aa30900..c9ee46a devel-stable -> rmk/devel-stable
d907387..a581da1 master -> rmk/master
151b6a5..85a3318 origin -> rmk/origin
\o/
I guess the problem is that I "Ctrl-C"d an earlier git fetch.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply
* Re: linux-next: manual merge of the arm tree with the arm-current tree
From: Russell King @ 2010-10-12 9:42 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Stephen Rothwell, linux-next, linux-kernel, Sascha Hauer,
Eric Bénard
In-Reply-To: <20101012092357.GE29673@pengutronix.de>
On Tue, Oct 12, 2010 at 11:23:57AM +0200, Uwe Kleine-König wrote:
> Hi Russell,
>
> On Tue, Oct 12, 2010 at 09:28:14AM +0100, Russell King wrote:
> > On Tue, Oct 12, 2010 at 10:03:54AM +0200, Uwe Kleine-König wrote:
> > > On Tue, Oct 12, 2010 at 10:33:14AM +1100, Stephen Rothwell wrote:
> > > > Hi Russell,
> > > >
> > > > Today's linux-next merge of the arm tree got a conflict in
> > > > arch/arm/mach-imx/mach-cpuimx27.c between commit
> > > > 4793ca4028e4dcdbf2740db50995c9378ded3cf8 ("cpuimx27: fix i2c bus
> > > > selection") from the arm-current tree and commit
> > > > 77a406da5a5b76445a816d5f043fc9aef4026ff1 ("ARM: imx: fix name of macros
> > > > to add imx-i2c devices") from the arm tree.
> > A more concerning question is - these recent conflicts have been happening
> > as a result of merging people's GIT trees, which tend to be sent close
> > to the merge window.
> >
> > If the first time their changes become visible to linux-next is when
> > they're merged into my tree, something is wrong...
> I tried to reconstruct that. I guess I cannot see yet that Russell took
> 4793ca4028e4dcdbf2740db50995c9378ded3cf8 because I have no access to
> Russell's kernel.org repo and his ftp.arm.linux.org.uk repo currently
> barfs for me and Stephen didn't push out a tree newer than 20101011 yet.
What's up with it? What URL are you using?
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply
* Re: linux-next: manual merge of the arm tree with the arm-current tree
From: Uwe Kleine-König @ 2010-10-12 9:23 UTC (permalink / raw)
To: Russell King
Cc: Stephen Rothwell, linux-next, linux-kernel, Sascha Hauer,
Eric Bénard
In-Reply-To: <20101012082814.GC12845@flint.arm.linux.org.uk>
Hi Russell,
On Tue, Oct 12, 2010 at 09:28:14AM +0100, Russell King wrote:
> On Tue, Oct 12, 2010 at 10:03:54AM +0200, Uwe Kleine-König wrote:
> > On Tue, Oct 12, 2010 at 10:33:14AM +1100, Stephen Rothwell wrote:
> > > Hi Russell,
> > >
> > > Today's linux-next merge of the arm tree got a conflict in
> > > arch/arm/mach-imx/mach-cpuimx27.c between commit
> > > 4793ca4028e4dcdbf2740db50995c9378ded3cf8 ("cpuimx27: fix i2c bus
> > > selection") from the arm-current tree and commit
> > > 77a406da5a5b76445a816d5f043fc9aef4026ff1 ("ARM: imx: fix name of macros
> > > to add imx-i2c devices") from the arm tree.
> A more concerning question is - these recent conflicts have been happening
> as a result of merging people's GIT trees, which tend to be sent close
> to the merge window.
>
> If the first time their changes become visible to linux-next is when
> they're merged into my tree, something is wrong...
I tried to reconstruct that. I guess I cannot see yet that Russell took
4793ca4028e4dcdbf2740db50995c9378ded3cf8 because I have no access to
Russell's kernel.org repo and his ftp.arm.linux.org.uk repo currently
barfs for me and Stephen didn't push out a tree newer than 20101011 yet.
4793ca4028e4dc is a regression fix that should go into .36, so this is
OK, isn't it. 77a406da5a5b76445a816d5f043fc9aef4026ff1 is already some
time in Sascha's tree, and so in next. But 4793ca4028e4dc is new and
only these two together conflict.
Stephen, note that Sascha fixed the same conflict already in his tree.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply
* Re: linux-next: manual merge of the arm tree with the arm-current tree
From: Russell King @ 2010-10-12 8:28 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Stephen Rothwell, linux-next, linux-kernel, Sascha Hauer,
Eric Bénard
In-Reply-To: <20101012080354.GC29673@pengutronix.de>
On Tue, Oct 12, 2010 at 10:03:54AM +0200, Uwe Kleine-König wrote:
> On Tue, Oct 12, 2010 at 10:33:14AM +1100, Stephen Rothwell wrote:
> > Hi Russell,
> >
> > Today's linux-next merge of the arm tree got a conflict in
> > arch/arm/mach-imx/mach-cpuimx27.c between commit
> > 4793ca4028e4dcdbf2740db50995c9378ded3cf8 ("cpuimx27: fix i2c bus
> > selection") from the arm-current tree and commit
> > 77a406da5a5b76445a816d5f043fc9aef4026ff1 ("ARM: imx: fix name of macros
> > to add imx-i2c devices") from the arm tree.
> >
> > I fixed it up (see below) can can carry the fix for a while.
> > --
> > Cheers,
> > Stephen Rothwell sfr@canb.auug.org.au
> >
> > diff --cc arch/arm/mach-imx/mach-cpuimx27.c
> > index 6830afd,28f73a1..0000000
> > --- a/arch/arm/mach-imx/mach-cpuimx27.c
> > +++ b/arch/arm/mach-imx/mach-cpuimx27.c
> > @@@ -259,8 -258,9 +258,9 @@@ static void __init eukrea_cpuimx27_init
> > i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,
> > ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));
> >
> > - imx27_add_i2c_imx0(&cpuimx27_i2c1_data);
> > - imx27_add_imx_i2c(1, &cpuimx27_i2c1_data);
> > ++ imx27_add_imx_i2c(0, &cpuimx27_i2c1_data);
> >
> > + imx27_add_fec(NULL);
> > platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
> >
> > #if defined(CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2)
> >
> This is resolved correctly.
A more concerning question is - these recent conflicts have been happening
as a result of merging people's GIT trees, which tend to be sent close
to the merge window.
If the first time their changes become visible to linux-next is when
they're merged into my tree, something is wrong...
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply
* Re: linux-next: manual merge of the arm tree with the arm-current tree
From: Uwe Kleine-König @ 2010-10-12 8:03 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Russell King, linux-next, linux-kernel, Sascha Hauer,
Eric Bénard
In-Reply-To: <20101012103314.41b00cbe.sfr@canb.auug.org.au>
On Tue, Oct 12, 2010 at 10:33:14AM +1100, Stephen Rothwell wrote:
> Hi Russell,
>
> Today's linux-next merge of the arm tree got a conflict in
> arch/arm/mach-imx/mach-cpuimx27.c between commit
> 4793ca4028e4dcdbf2740db50995c9378ded3cf8 ("cpuimx27: fix i2c bus
> selection") from the arm-current tree and commit
> 77a406da5a5b76445a816d5f043fc9aef4026ff1 ("ARM: imx: fix name of macros
> to add imx-i2c devices") from the arm tree.
>
> I fixed it up (see below) can can carry the fix for a while.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-imx/mach-cpuimx27.c
> index 6830afd,28f73a1..0000000
> --- a/arch/arm/mach-imx/mach-cpuimx27.c
> +++ b/arch/arm/mach-imx/mach-cpuimx27.c
> @@@ -259,8 -258,9 +258,9 @@@ static void __init eukrea_cpuimx27_init
> i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,
> ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));
>
> - imx27_add_i2c_imx0(&cpuimx27_i2c1_data);
> - imx27_add_imx_i2c(1, &cpuimx27_i2c1_data);
> ++ imx27_add_imx_i2c(0, &cpuimx27_i2c1_data);
>
> + imx27_add_fec(NULL);
> platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
>
> #if defined(CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2)
>
This is resolved correctly.
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply
* Re: linux-next: manual merge of the oprofile tree with the tip tree
From: Matt Fleming @ 2010-10-12 6:03 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Robert Richter, linux-next, linux-kernel, Matt Helsley,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
In-Reply-To: <20101012131828.5fedf1bf.sfr@canb.auug.org.au>
On Tue, Oct 12, 2010 at 01:18:28PM +1100, Stephen Rothwell wrote:
> Hi Robert,
>
> Today's linux-next merge of the oprofile tree got a conflict in
> arch/arm/oprofile/common.c between commit
> 38a81da2205f94e8a2a834b51a6b99c91fc7c2e8 ("perf events: Clean up pid
> passing") from the tip tree and commit
> 3d90a00763b51e1db344a7430c966be723b67a29 ("oprofile: Abstract the
> perf-events backend") from the oprofile tree.
>
> The latter moved the code modified by the former, so I used the version
> of this file from the oprofile tree. I also applied the effect of the
> tip tree patch to the new file drivers/oprofile/oprofile_perf.c:
>
> diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c
> index b17235a..afbc43b 100644
> --- a/drivers/oprofile/oprofile_perf.c
> +++ b/drivers/oprofile/oprofile_perf.c
> @@ -77,7 +77,7 @@ static int op_create_counter(int cpu, int event)
> return 0;
>
> pevent = perf_event_create_kernel_counter(&counter_config[event].attr,
> - cpu, -1,
> + cpu, NULL1,
> op_overflow_handler);
Is that a typo? Shouldn't that be NULL, and not NULL1?
^ permalink raw reply
* Re: linux-next: manual merge of the net tree with the tree
From: Stefan Richter @ 2010-10-12 5:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: netdev, linux-kernel, linux-next, Ben Hutchings, linux1394-devel,
David Miller
In-Reply-To: <20101012145135.9697fe21.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 12 Oct 2010 11:17:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Today's linux-next merge of the net tree got a conflict in
>> drivers/ieee1394/eth1394.c between commit
>> 66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
>> 1394 driver stack") from the tree and commit
> ^
> I meant to say "the ieee1394 tree".
(I should have put the ieee1394 removal into -next much earlier. OTOH the
conflicting commit is from August 17 already...)
Would it be useful if I rebase this small ieee1394 removal branch of mine onto
net?
--
Stefan Richter
-=====-==-=- =-=- -==--
http://arcgraph.de/sr/
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
^ permalink raw reply
* linux-next: Tree for October 12
From: Stephen Rothwell @ 2010-10-12 5:35 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 11763 bytes --]
Hi all,
Note: for those that are interested in these things, there is a graph of
linux-next and Linus' tree progress at
http://neuling.org/linux-next-size.html . You can zoom by selecting a
horizontal area.
Changes since 20101011:
The arm tree gained a conflict against the arm-current tree.
The net tree gained a conflict against the ieee1394.
The trivial tree gained a conflict against the net tree.
The catalin tree lost a conflict.
The oprofile tree gained conflicts against the tip tree.
The workqueues tree gained a conflict against the gfs2 tree.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 176 trees (counting Linus' and 22 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/rc-fixes
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging gcl-current/merge
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-cpuimx27.c
Merging davinci/davinci-next
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-mx25/clock.c
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices/Kconfig
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices/Makefile
CONFLICT (add/add): Merge conflict in arch/arm/plat-mxc/devices/platform-imx-dma.c
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Applying: xfs: fix up mismerge of __xfs_inode_clear_reclaim_tag
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c
Merging dlm/next
Merging swiotlb/master
Merging swiotlb-xen/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging wireless/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3pandora.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-zoom-peripherals.c
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/if_sdio.c
Merging net/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (delete/modify): drivers/ieee1394/eth1394.c deleted in HEAD and modified in net/master. Version net/master of drivers/ieee1394/eth1394.c left in tree.
$ git rm -f drivers/ieee1394/eth1394.c
Merging mtd/master
Merging crypto/master
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
Merging sound-asoc/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/dev-audio.c
CONFLICT (content): Merge conflict in drivers/video/sh_mobile_hdmi.c
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
CONFLICT (content): Merge conflict in drivers/input/keyboard/Kconfig
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ext4/mballoc.c
Applying: ext4: merge fix for blkdev_issue_zeroout API change
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/net/pcmcia/smc91c92_cs.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
CONFLICT (content): Merge conflict in drivers/char/sysrq.c
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/mfd/sh_mobile_sdhi.c
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in net/irda/irnet/irnet_ppp.c
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/ct-ca9x4.c
CONFLICT (content): Merge conflict in arch/arm/mm/flush.c
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging omap_dss2/for-next
Merging xen/upstream/xen
Merging rcu/rcu/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in net/core/dev.c
Merging edac-amd/for-next
Merging oprofile/for-next
CONFLICT (content): Merge conflict in arch/arm/oprofile/common.c
CONFLICT (content): Merge conflict in kernel/perf_event.c
Applying: perf events: fix up merge conflict
Merging percpu/for-next
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in mm/percpu.c
Merging workqueues/for-next
CONFLICT (content): Merge conflict in fs/gfs2/main.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging quilt/tty
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/gadget/rndis.c
Merging staging-next/staging-next
CONFLICT (rename/modify): Merge conflict in drivers/misc/ti-st/st_kim.c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/devices.c
CONFLICT (content): Merge conflict in drivers/misc/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/batman-adv/hard-interface.c
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/Makefile deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/Makefile left in tree.
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/intel-mid-touch.c deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/intel-mid-touch.c left in tree.
CONFLICT (delete/modify): drivers/staging/ti-st/st_core.h deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/ti-st/st_core.h left in tree.
$ git rm -f drivers/staging/mrst-touchscreen/Makefile drivers/staging/mrst-touchscreen/intel-mid-touch.c
$ git rm -f drivers/staging/ti-st/st.h drivers/staging/ti-st/st_core.h
Applying: staging: ath6kl: Fixing the driver to use modified mmc_host structure
Merging slabh/slabh
Merging bkl-trivial/trivial
CONFLICT (content): Merge conflict in drivers/block/ataflop.c
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4000_cs.c
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4040_cs.c
CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
Merging bkl-llseek/llseek
CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb4/device.c
Merging bkl-vfs/vfs
CONFLICT (content): Merge conflict in fs/cifs/cifsfs.c
CONFLICT (content): Merge conflict in fs/nilfs2/super.c
Merging bkl-config/config
CONFLICT (content): Merge conflict in fs/compat_ioctl.c
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (wireless tree related)
From: Stephen Rothwell @ 2010-10-12 5:35 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Ben Greear
[-- Attachment #1: Type: text/plain, Size: 419 bytes --]
Hi John,
After merging the final tree, today's linux-next build failed like this:
ERROR: ".ath_opmode_to_string" [drivers/net/wireless/ath/ath5k/ath5k.ko] undefined!
CONFIG_ATH5K_DEBUG is not set ...
Caused by commit 92c68a66a8f73c51f062ae8cae958c86a21fea78 ("ath5k: Print
out opmode in debugfs").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the net tree with the tree
From: Stephen Rothwell @ 2010-10-12 3:51 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Stefan Richter, linux1394-devel,
Ben Hutchings
In-Reply-To: <20101012111716.0c54b093.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
Hi all,
On Tue, 12 Oct 2010 11:17:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/ieee1394/eth1394.c between commit
> 66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
> 1394 driver stack") from the tree and commit
^
I meant to say "the ieee1394 tree".
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the workqueues tree with the gfs2 tree
From: Stephen Rothwell @ 2010-10-12 2:53 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-next, linux-kernel, Steven Whitehouse
Hi Tejun,
Today's linux-next merge of the workqueues tree got a conflict in
fs/gfs2/main.c between commit 9fa0ea9f26f64fbfc3dfd51d1dc2c230b65ffb19
("GFS2: Use new workqueue scheme") from the gfs2 tree and commit
6370a6ad3b53df90b4700977f7718118a2cd524a ("workqueue: add and use
WQ_MEM_RECLAIM flag") from the workqueues tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/gfs2/main.c
index d7eb1e2,1c5f460..0000000
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@@ -144,7 -140,7 +144,7 @@@ static int __init init_gfs2_fs(void
error = -ENOMEM;
gfs_recovery_wq = alloc_workqueue("gfs_recovery",
- WQ_RESCUER | WQ_FREEZEABLE, 0);
- WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0);
++ WQ_MEM_RECLAIM | WQ_FREEZEABLE, 0);
if (!gfs_recovery_wq)
goto fail_wq;
^ permalink raw reply
* linux-next: manual merge of the oprofile tree with the tip tree
From: Stephen Rothwell @ 2010-10-12 2:18 UTC (permalink / raw)
To: Robert Richter
Cc: linux-next, linux-kernel, Matt Helsley, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra, Matt Fleming
Hi Robert,
Today's linux-next merge of the oprofile tree got a conflict in
arch/arm/oprofile/common.c between commit
38a81da2205f94e8a2a834b51a6b99c91fc7c2e8 ("perf events: Clean up pid
passing") from the tip tree and commit
3d90a00763b51e1db344a7430c966be723b67a29 ("oprofile: Abstract the
perf-events backend") from the oprofile tree.
The latter moved the code modified by the former, so I used the version
of this file from the oprofile tree. I also applied the effect of the
tip tree patch to the new file drivers/oprofile/oprofile_perf.c:
diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c
index b17235a..afbc43b 100644
--- a/drivers/oprofile/oprofile_perf.c
+++ b/drivers/oprofile/oprofile_perf.c
@@ -77,7 +77,7 @@ static int op_create_counter(int cpu, int event)
return 0;
pevent = perf_event_create_kernel_counter(&counter_config[event].attr,
- cpu, -1,
+ cpu, NULL1,
op_overflow_handler);
if (IS_ERR(pevent))
--
1.7.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: manual merge of the oprofile tree with the tip tree
From: Stephen Rothwell @ 2010-10-12 2:13 UTC (permalink / raw)
To: Robert Richter
Cc: linux-next, linux-kernel, Matt Fleming, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Hi Robert,
Today's linux-next merge of the oprofile tree got a conflict in
kernel/perf_event.c between commit
33696fc0d141bbbcb12f75b69608ea83282e3117 ("perf: Per PMU disable") from
the tip tree and commit 84c7991059c9c4530cc911137c5bf508a41ed129 ("perf:
New helper function for pmu name") from the oprofile tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/perf_event.c
index 64507ea,fc51268..0000000
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@@ -61,38 -67,41 +61,43 @@@ int sysctl_perf_event_sample_rate __rea
static atomic64_t perf_event_id;
-/*
- * Lock for (sysadmin-configurable) event reservations:
- */
-static DEFINE_SPINLOCK(perf_resource_lock);
+void __weak perf_event_print_debug(void) { }
-/*
- * Architecture provided APIs - weak aliases:
- */
-extern __weak const struct pmu *hw_perf_event_init(struct perf_event *event)
+void perf_pmu_disable(struct pmu *pmu)
{
- return NULL;
+ int *count = this_cpu_ptr(pmu->pmu_disable_count);
+ if (!(*count)++)
+ pmu->pmu_disable(pmu);
}
-void __weak hw_perf_disable(void) { barrier(); }
-void __weak hw_perf_enable(void) { barrier(); }
-
-void __weak perf_event_print_debug(void) { }
-
+ extern __weak const char *perf_pmu_name(void)
+ {
+ return "pmu";
+ }
+
-static DEFINE_PER_CPU(int, perf_disable_count);
-
-void perf_disable(void)
+void perf_pmu_enable(struct pmu *pmu)
{
- if (!__get_cpu_var(perf_disable_count)++)
- hw_perf_disable();
+ int *count = this_cpu_ptr(pmu->pmu_disable_count);
+ if (!--(*count))
+ pmu->pmu_enable(pmu);
}
-void perf_enable(void)
+static DEFINE_PER_CPU(struct list_head, rotation_list);
+
+/*
+ * perf_pmu_rotate_start() and perf_rotate_context() are fully serialized
+ * because they're strictly cpu affine and rotate_start is called with IRQs
+ * disabled, while rotate_context is called from IRQ context.
+ */
+static void perf_pmu_rotate_start(struct pmu *pmu)
{
- if (!--__get_cpu_var(perf_disable_count))
- hw_perf_enable();
+ struct perf_cpu_context *cpuctx = this_cpu_ptr(pmu->pmu_cpu_context);
+ struct list_head *head = &__get_cpu_var(rotation_list);
+
+ WARN_ON(!irqs_disabled());
+
+ if (list_empty(&cpuctx->rotation_list))
+ list_add(&cpuctx->rotation_list, head);
}
static void get_ctx(struct perf_event_context *ctx)
^ permalink raw reply
* linux-next: manual merge of the trivial tree with the net tree
From: Stephen Rothwell @ 2010-10-12 0:53 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, linux-kernel, Thomas Weber, Samuel Ortiz
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
net/irda/irnet/irnet_ppp.c between commit
f8cba16cad68c9b9ee7fecae48a1b91708e8e482 ("irda: Remove BKL instances
from irnet") from the net tree and commit
b42e17963c20ecb80905083ceaecc79fd9bd30f1 ("Fix typo configue => configure
in comments") from the trivial tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/irda/irnet/irnet_ppp.c
index 0993bd4,36f43ca..0000000
--- a/net/irda/irnet/irnet_ppp.c
+++ b/net/irda/irnet/irnet_ppp.c
@@@ -664,10 -663,8 +664,10 @@@ dev_irnet_ioctl
if((val == N_SYNC_PPP) || (val == N_PPP))
{
DEBUG(FS_INFO, "Entering PPP discipline.\n");
- /* PPP channel setup (ap->chan in configued in dev_irnet_open())*/
+ /* PPP channel setup (ap->chan in configured in dev_irnet_open())*/
- lock_kernel();
+ if (mutex_lock_interruptible(&ap->lock))
+ return -EINTR;
+
err = ppp_register_channel(&ap->chan);
if(err == 0)
{
^ permalink raw reply
* [PATCH -next] staging/intel_sst: include delay.h to fix build error
From: Randy Dunlap @ 2010-10-12 0:47 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, driverdevel, linux-next, LKML, Vinod Koul,
Harsha Priya, Dharageswari R
In-Reply-To: <20101010202921.GB4900@kroah.com>
From: Randy Dunlap <randy.dunlap@oracle.com>
intel_sst_drv_interface.c uses msleep() so it needs to include delay.h:
drivers/staging/intel_sst/intel_sst_drv_interface.c:88: error: implicit declaration of function 'msleep'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/staging/intel_sst/intel_sst_drv_interface.c | 1 +
1 file changed, 1 insertion(+)
--- linux-next-20101008.orig/drivers/staging/intel_sst/intel_sst_drv_interface.c
+++ linux-next-20101008/drivers/staging/intel_sst/intel_sst_drv_interface.c
@@ -26,6 +26,7 @@
* Upper layer interfaces (MAD driver, MMF) to SST driver
*/
+#include <linux/delay.h>
#include <linux/pci.h>
#include <linux/fs.h>
#include <linux/firmware.h>
^ permalink raw reply
* linux-next: manual merge of the net tree with the tree
From: Stephen Rothwell @ 2010-10-12 0:17 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Stefan Richter, linux1394-devel,
Ben Hutchings
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
Hi all,
Today's linux-next merge of the net tree got a conflict in
drivers/ieee1394/eth1394.c between commit
66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
1394 driver stack") from the tree and commit
01414802054c382072b6cb9a1bdc6e243c74b2d5 ("ethtool: Provide a default
implementation of ethtool_ops::get_drvinfo") from the net tree.
The former removes the file. I just did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm tree with the arm-current tree
From: Stephen Rothwell @ 2010-10-11 23:33 UTC (permalink / raw)
To: Russell King
Cc: linux-next, linux-kernel, "Uwe Kleine-König",
Sascha Hauer, "Eric Bénard"
Hi Russell,
Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-imx/mach-cpuimx27.c between commit
4793ca4028e4dcdbf2740db50995c9378ded3cf8 ("cpuimx27: fix i2c bus
selection") from the arm-current tree and commit
77a406da5a5b76445a816d5f043fc9aef4026ff1 ("ARM: imx: fix name of macros
to add imx-i2c devices") from the arm tree.
I fixed it up (see below) can can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-imx/mach-cpuimx27.c
index 6830afd,28f73a1..0000000
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@@ -259,8 -258,9 +258,9 @@@ static void __init eukrea_cpuimx27_init
i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,
ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));
- imx27_add_i2c_imx0(&cpuimx27_i2c1_data);
- imx27_add_imx_i2c(1, &cpuimx27_i2c1_data);
++ imx27_add_imx_i2c(0, &cpuimx27_i2c1_data);
+ imx27_add_fec(NULL);
platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
#if defined(CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2)
^ permalink raw reply
* RE: linux-next: manual merge of the sound-asoc tree with the s5p tree
From: Kukjin Kim @ 2010-10-11 22:26 UTC (permalink / raw)
To: 'Stephen Rothwell'
Cc: 'Mark Brown', 'Liam Girdwood', linux-next,
linux-kernel, 'Dimitris Papastamos'
In-Reply-To: <20101011193336.835d9f78.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
>
> Hi Kgene,
>
> On Mon, 11 Oct 2010 16:33:48 +0900 Kukjin Kim <kgene.kim@samsung.com>
> wrote:
> >
> > > Today's linux-next merge of the sound-asoc tree got a conflict in
> > > arch/arm/mach-s3c64xx/dev-audio.c between commit
> > > f08269d850e4ee0cd028cf5279cc08259d0469df ("ARM: S3C64XX: Change to
> using
> > > s3c_gpio_cfgpin_range()") from the s5p tree and commit
> > > e4b6b74ffd32d114227a5dcfe814e2cecd80554b ("ARM: S3C64XX: Fix
> fallthrough
> > > bug in i2sv3 gpio configuration, improve logging") from the sound-asoc
> > > tree.
> > >
> > Hmm...how can/should I handle for it?
>
> Don't worry about it. It is trivial and both I and Linus can take care
> of it.
>
Hi Stephen :-)
Thank you so much.
Have a nice day ;-)
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply
* Re: [PATCH] kconfig: Temporarily disable dependency warnings
From: Randy Dunlap @ 2010-10-11 21:59 UTC (permalink / raw)
To: Michal Marek
Cc: Catalin Marinas, linux-kbuild, sfr, linux-next, linux-kernel,
lacombar, xiyou.wangcong
In-Reply-To: <4CB385C8.7010109@suse.cz>
On Mon, 11 Oct 2010 23:46:48 +0200 Michal Marek wrote:
> On 11.10.2010 17:23, Catalin Marinas wrote:
> > On Sat, 2010-10-09 at 22:45 +0100, Michal Marek wrote:
> >> After fixing a use-after-free bug in kconfig, a 'make defconfig' or
> >> 'make allmodconfig' fills the screen with warnings that were not
> >> detected before. Given that we are close to the release now, disable the
> >> warnings temporarily and deal with them after 2.6.36.
> >>
> >> Signed-off-by: Michal Marek <mmarek@suse.cz>
> >
> > Acked-by: Catalin Marinas <catalin.marinas@arm.com>
>
> Thanks, but I already pushed it on Saturday. The good news is that Linus
> did pull from me, so 2.6.36 will have this.
Was it disabled (i.e., this patch applied) in linux-next 20101011?
Seems to be -- I see no warnings.
Can you undo that now so that warnings are back, please?
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: [PATCH] kconfig: Temporarily disable dependency warnings
From: Michal Marek @ 2010-10-11 21:46 UTC (permalink / raw)
To: Catalin Marinas
Cc: linux-kbuild, sfr, linux-next, linux-kernel, lacombar,
xiyou.wangcong
In-Reply-To: <1286810580.19739.108.camel@e102109-lin.cambridge.arm.com>
On 11.10.2010 17:23, Catalin Marinas wrote:
> On Sat, 2010-10-09 at 22:45 +0100, Michal Marek wrote:
>> After fixing a use-after-free bug in kconfig, a 'make defconfig' or
>> 'make allmodconfig' fills the screen with warnings that were not
>> detected before. Given that we are close to the release now, disable the
>> warnings temporarily and deal with them after 2.6.36.
>>
>> Signed-off-by: Michal Marek <mmarek@suse.cz>
>
> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Thanks, but I already pushed it on Saturday. The good news is that Linus
did pull from me, so 2.6.36 will have this.
Michal
^ permalink raw reply
* Re: linux-next: build warning after merge of the final tree (tip tree related)
From: Yinghai Lu @ 2010-10-11 19:34 UTC (permalink / raw)
To: H. Peter Anvin
Cc: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, Peter Zijlstra,
linux-next, linux-kernel
In-Reply-To: <4CB35EC1.5040909@zytor.com>
On 10/11/2010 12:00 PM, H. Peter Anvin wrote:
> On 10/11/2010 10:09 AM, Yinghai Lu wrote:
>>
>> make all functions in memblock.c without __init to carry __init_memblock.
>>
>>
>> -static phys_addr_t __init memblock_find_region(phys_addr_t start, phys_addr_t end,
>> +static phys_addr_t __init_memblock memblock_find_region(phys_addr_t start, phys_addr_t end,
>> phys_addr_t size, phys_addr_t align)
>>
>> -static int memblock_search(struct memblock_type *type, phys_addr_t addr)
>> +static int __init_memblock memblock_search(struct memblock_type *type, phys_addr_t addr)
>>
>
> Your patch description doesn't match what your patch does. Please write
> a correct description.
please check
[PATCH -v2] x86: Fix section mismatch with memblock_find_region()
Stephen found
WARNING: mm/built-in.o(.text+0x25ab8): Section mismatch in reference from the function memblock_find_base() to the function .init.text:memblock_find_region()
The function memblock_find_base() references
the function __init memblock_find_region().
This is often because memblock_find_base lacks a __init
annotation or the annotation of memblock_find_region is wrong.
So let memblock_find_region() to use __init_memblock insteaf of __init directly.
Also make left function that doesn't have __init* to carry __init_memblock.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
mm/memblock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: linux-2.6/mm/memblock.c
===================================================================
--- linux-2.6.orig/mm/memblock.c
+++ linux-2.6/mm/memblock.c
@@ -99,7 +99,7 @@ long __init_memblock memblock_overlaps_r
* are top-down.
*/
-static phys_addr_t __init memblock_find_region(phys_addr_t start, phys_addr_t end,
+static phys_addr_t __init_memblock memblock_find_region(phys_addr_t start, phys_addr_t end,
phys_addr_t size, phys_addr_t align)
{
phys_addr_t base, res_base;
@@ -653,7 +653,7 @@ void __init memblock_enforce_memory_limi
}
}
-static int memblock_search(struct memblock_type *type, phys_addr_t addr)
+static int __init_memblock memblock_search(struct memblock_type *type, phys_addr_t addr)
{
unsigned int left = 0, right = type->cnt;
^ permalink raw reply
* Re: linux-next: build warning after merge of the final tree (tip tree related)
From: H. Peter Anvin @ 2010-10-11 19:00 UTC (permalink / raw)
To: Yinghai Lu
Cc: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, Peter Zijlstra,
linux-next, linux-kernel
In-Reply-To: <4CB344C6.5040408@kernel.org>
On 10/11/2010 10:09 AM, Yinghai Lu wrote:
>
> make all functions in memblock.c without __init to carry __init_memblock.
>
>
> -static phys_addr_t __init memblock_find_region(phys_addr_t start, phys_addr_t end,
> +static phys_addr_t __init_memblock memblock_find_region(phys_addr_t start, phys_addr_t end,
> phys_addr_t size, phys_addr_t align)
>
> -static int memblock_search(struct memblock_type *type, phys_addr_t addr)
> +static int __init_memblock memblock_search(struct memblock_type *type, phys_addr_t addr)
>
Your patch description doesn't match what your patch does. Please write
a correct description.
-hpa
^ permalink raw reply
* Re: linux-next: Tree for October 11 (staging/keucr)
From: Greg KH @ 2010-10-11 17:25 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, driverdevel, linux-next, LKML, Al Cho
In-Reply-To: <20101011094222.98a30bce.randy.dunlap@oracle.com>
On Mon, Oct 11, 2010 at 09:42:22AM -0700, Randy Dunlap wrote:
> On Mon, 11 Oct 2010 16:29:59 +1100 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Changes since 20101008:
>
>
> linux-next-20101011/drivers/staging/keucr/usb.c: In function 'get_transport':
> linux-next-20101011/drivers/staging/keucr/usb.c:346: error: 'US_PR_BULK' undeclared (first use in this function)
> linux-next-20101011/drivers/staging/keucr/usb.c:346: error: (Each undeclared identifier is reported only once
> linux-next-20101011/drivers/staging/keucr/usb.c:346: error: for each function it appears in.)
> linux-next-20101011/drivers/staging/keucr/usb.c: In function 'get_protocol':
> linux-next-20101011/drivers/staging/keucr/usb.c:370: error: 'US_SC_SCSI' undeclared (first use in this function)
> linux-next-20101011/drivers/staging/keucr/usb.c: In function 'get_pipes':
> linux-next-20101011/drivers/staging/keucr/usb.c:421: error: 'US_PR_CBI' undeclared (first use in this function)
> linux-next-20101011/drivers/staging/keucr/usb.c: In function 'usb_stor_scan_thread':
> linux-next-20101011/drivers/staging/keucr/usb.c:567: error: 'US_PR_BULK' undeclared (first use in this function)
> linux-next-20101011/drivers/staging/keucr/scsiglue.c: In function 'slave_alloc':
> linux-next-20101011/drivers/staging/keucr/scsiglue.c:33: error: 'US_SC_UFI' undeclared (first use in this function)
> linux-next-20101011/drivers/staging/keucr/scsiglue.c:33: error: (Each undeclared identifier is reported only once
> linux-next-20101011/drivers/staging/keucr/scsiglue.c:33: error: for each function it appears in.)
> linux-next-20101011/drivers/staging/keucr/scsiglue.c: In function 'slave_configure':
> linux-next-20101011/drivers/staging/keucr/scsiglue.c:58: error: 'US_SC_SCSI' undeclared (first use in this function)
> linux-next-20101011/drivers/staging/keucr/scsiglue.c:58: error: 'US_SC_CYP_ATACB' undeclared (first use in this function)
> linux-next-20101011/drivers/staging/keucr/scsiglue.c:79: error: 'US_PR_CB' undeclared (first use in this function)
> linux-next-20101011/drivers/staging/keucr/scsiglue.c:79: error: 'US_PR_CBI' undeclared (first use in this function)
> linux-next-20101011/drivers/staging/keucr/transport.c: In function 'usb_stor_invoke_transport':
> linux-next-20101011/drivers/staging/keucr/transport.c:318: error: 'US_PR_CB' undeclared (first use in this function)
> linux-next-20101011/drivers/staging/keucr/transport.c:318: error: (Each undeclared identifier is reported only once
> linux-next-20101011/drivers/staging/keucr/transport.c:318: error: for each function it appears in.)
> linux-next-20101011/drivers/staging/keucr/transport.c:318: error: 'US_PR_DPCM_USB' undeclared (first use in this function)
> linux-next-20101011/drivers/staging/keucr/transport.c:341: error: 'US_SC_RBC' undeclared (first use in this function)
> linux-next-20101011/drivers/staging/keucr/transport.c:341: error: 'US_SC_SCSI' undeclared (first use in this function)
> linux-next-20101011/drivers/staging/keucr/transport.c:341: error: 'US_SC_CYP_ATACB' undeclared (first use in this function)
> In file included from linux-next-20101011/drivers/staging/keucr/smilmain.c:4:
> linux-next-20101011/drivers/staging/keucr/smcommon.h:9:1: warning: "SUCCESS" redefined
> In file included from linux-next-20101011/include/scsi/scsi_host.h:9,
> from linux-next-20101011/drivers/staging/keucr/usb.h:11,
> from linux-next-20101011/drivers/staging/keucr/smilmain.c:2:
> linux-next-20101011/include/scsi/scsi.h:429:1: warning: this is the location of the previous definition
> In file included from linux-next-20101011/drivers/staging/keucr/smilsub.c:9:
> linux-next-20101011/drivers/staging/keucr/smcommon.h:9:1: warning: "SUCCESS" redefined
> In file included from linux-next-20101011/include/scsi/scsi_host.h:9,
> from linux-next-20101011/drivers/staging/keucr/usb.h:11,
> from linux-next-20101011/drivers/staging/keucr/smilsub.c:2:
> linux-next-20101011/include/scsi/scsi.h:429:1: warning: this is the location of the previous definition
> In file included from linux-next-20101011/drivers/staging/keucr/smilecc.c:6:
> linux-next-20101011/drivers/staging/keucr/smcommon.h:9:1: warning: "SUCCESS" redefined
> In file included from linux-next-20101011/include/scsi/scsi_host.h:9,
> from linux-next-20101011/drivers/staging/keucr/usb.h:11,
> from linux-next-20101011/drivers/staging/keucr/smilecc.c:1:
> linux-next-20101011/include/scsi/scsi.h:429:1: warning: this is the location of the previous definition
>
>
>
> config is attached.
Yes, this is known, I will fix it up when I merge the two trees
together, it's due to changes in the USB tree that are not in the
staging-next tree.
thanks,
greg k-h
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox