* linux-next: manual merge of the pwm tree with the tegra tree
From: Stephen Rothwell @ 2012-06-29 6:54 UTC (permalink / raw)
To: Thierry Reding
Cc: linux-next, linux-kernel, Laxman Dewangan, Stephen Warren,
Colin Cross, Olof Johansson
[-- Attachment #1: Type: text/plain, Size: 1706 bytes --]
Hi Thierry,
Today's linux-next merge of the pwm tree got conflicts in
arch/arm/mach-tegra/board-dt-tegra20.c and
arch/arm/mach-tegra/board-dt-tegra30.c between commit bd976e0307fb ("ARM:
tegra: add device tree AUXDATA for APBDMA") from the tegra tree and
commit 3ad1308c8dee ("pwm: tegra: Add device tree support") from the pwm
tree.
Just context changes. I fixed them up (see below) and can carry the fix
as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
index 1b43c33,962f1a1..0000000
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@@ -64,7 -64,7 +64,8 @@@ struct of_dev_auxdata tegra20_auxdata_l
&tegra_ehci2_pdata),
OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB3_BASE, "tegra-ehci.2",
&tegra_ehci3_pdata),
+ OF_DEV_AUXDATA("nvidia,tegra20-apbdma", 0x6000a000, "tegra-apbdma", NULL),
+ OF_DEV_AUXDATA("nvidia,tegra20-pwm", TEGRA_PWFM_BASE, "tegra-pwm", NULL),
{}
};
diff --cc arch/arm/mach-tegra/board-dt-tegra30.c
index 4a40986,ffc6cae..0000000
--- a/arch/arm/mach-tegra/board-dt-tegra30.c
+++ b/arch/arm/mach-tegra/board-dt-tegra30.c
@@@ -52,7 -54,7 +54,8 @@@ struct of_dev_auxdata tegra30_auxdata_l
OF_DEV_AUXDATA("nvidia,tegra20-i2c", 0x7000C700, "tegra-i2c.3", NULL),
OF_DEV_AUXDATA("nvidia,tegra20-i2c", 0x7000D000, "tegra-i2c.4", NULL),
OF_DEV_AUXDATA("nvidia,tegra30-ahub", 0x70080000, "tegra30-ahub", NULL),
+ OF_DEV_AUXDATA("nvidia,tegra30-apbdma", 0x6000a000, "tegra-apbdma", NULL),
+ OF_DEV_AUXDATA("nvidia,tegra30-pwm", TEGRA_PWFM_BASE, "tegra-pwm", NULL),
{}
};
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the pwm tree with the s5p tree
From: Stephen Rothwell @ 2012-06-29 6:49 UTC (permalink / raw)
To: Thierry Reding
Cc: linux-next, linux-kernel, Bartlomiej Zolnierkiewicz, Kukjin Kim,
Kyungmin Park, Sascha Hauer, "Eric Bénard"
[-- Attachment #1: Type: text/plain, Size: 925 bytes --]
Hi Thierry,
Today's linux-next merge of the pwm tree got a conflict in
arch/arm/plat-samsung/Makefile between commit 65ab16fd385f ("ARM: EXYNOS:
Remove leftovers of the Samsung specific power domain control") from the
s5p tree and commit 2663e766c56a ("ARM Samsung: Move s3c pwm driver to
pwm framework") from the pwm 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 arch/arm/plat-samsung/Makefile
index 4bb58c2,9685472..0000000
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@@ -59,7 -59,7 +59,3 @@@ obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeu
obj-$(CONFIG_S5P_PM) += s5p-pm.o s5p-irq-pm.o
obj-$(CONFIG_S5P_SLEEP) += s5p-sleep.o
--
- # PWM support
-
- obj-$(CONFIG_HAVE_PWM) += pwm.o
-# PD support
-
-obj-$(CONFIG_SAMSUNG_PD) += pd.o
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* RE: linux-next: manual merge of the net-next tree with the net tree
From: Sjur BRENDELAND @ 2012-06-29 6:46 UTC (permalink / raw)
To: Stephen Rothwell, David Miller, netdev@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Per ELLEFSEN, Kim LILLIESTIERNA
In-Reply-To: <20120626131543.21e4338894b19f5e02f8bdde@canb.auug.org.au>
Hi Stephen,
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/caif/caif_hsi.c between commits 3935600a7f34 ("caif-hsi:
> Bugfix - Piggyback'ed embedded CAIF frame lost") and 1fdc7630b2cb
> ("caif-hsi: Add missing return in error path") from the net tree and
> commits 4e7bb59d49fb ("caif-hsi: Removed dead code") and c41254006377
> ("caif-hsi: Add rtnl support") from the net-next tree.
>
> I fixed them up (see below) and can carry the fix as necessary.
Sorry for late response. Your merge looks perfect.
Thanks,
Sjur
^ permalink raw reply
* linux-next: manual merge of the staging tree with the trivial tree
From: Stephen Rothwell @ 2012-06-29 5:57 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Paul Bolle, Jiri Kosina,
H Hartley Sweeten
[-- Attachment #1: Type: text/plain, Size: 472 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/s626.h between commit 6ac7d11527a3
("treewide: Put a space between #include and FILE") from the trivial tree
and commit 90fd56af25b7 ("staging: comedi: s626: remove private INLINE
macro") from the staging tree.
Just context changes. I fixed it up and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* RE: commit "ARM: dma-mapping: remove custom consistent dma region"
From: Marek Szyprowski @ 2012-06-29 5:22 UTC (permalink / raw)
To: 'Paul Gortmaker'; +Cc: kyungmin.park, linux-arm-kernel, linux-next
In-Reply-To: <20120627194604.GA9445@windriver.com>
Hi Paul,
On Wednesday, June 27, 2012 9:46 PM Paul Gortmaker wrote:
> This commit in linux-next:
>
> commit feb930cb9beb75cbe1d1e798870599c3aa1b93ec
> Author: Marek Szyprowski <m.szyprowski@samsung.com>
> Date: Fri Jun 8 12:08:32 2012 +0200
>
> ARM: dma-mapping: remove custom consistent dma region
>
> seems to break the at91x40_defconfig (according to git bisect).
>
> CC arch/arm/mm/dma-mapping.o
> arch/arm/mm/dma-mapping.c: In function '__dma_alloc':
> arch/arm/mm/dma-mapping.c:575: error: macro "__alloc_from_pool" requires 4 arguments, but only
> 2 given
> arch/arm/mm/dma-mapping.c:575: error: '__alloc_from_pool' undeclared (first use in this
> function)
> arch/arm/mm/dma-mapping.c:575: error: (Each undeclared identifier is reported only once
> arch/arm/mm/dma-mapping.c:575: error: for each function it appears in.)
> make[2]: *** [arch/arm/mm/dma-mapping.o] Error 1
> make[1]: *** [arch/arm/mm/dma-mapping.o] Error 2
>
> See http://kisskb.ellerman.id.au/kisskb/buildresult/6596769/ for a full log.
>
> Please have a look when you get a chance.
Thanks for the report! I've added a fix to my dma-mapping-next branch, the issue should go
away with the next update of linus-next tree.
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
^ permalink raw reply
* Re: linux-next: manual merge of the m68knommu tree with Linus' tree
From: Greg Ungerer @ 2012-06-29 4:48 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Steven King
In-Reply-To: <20120629113310.e578f61aa71e9350a3596833@canb.auug.org.au>
Hi Stephen,
On 29/06/12 11:33, Stephen Rothwell wrote:
> Today's linux-next merge of the m68knommu tree got a conflict in
> arch/m68k/platform/coldfire/clk.c between commit 19a1d332cc8c
> ("m68knommu: define a local devm_clk_get() function") from Linus' tree
> and commit a0412a2ddaa3 ("m68knommu: Add support for the Coldfire
> m5441x") from the m68knommu tree.
Ah, yes, that would be right.
> I fixed it up (I think - see below) and can carry the fix as necessary.
I think though that the change made by commit 19a1d332cc8c ("m68knommu:
define a local devm_clk_get() function") needs also to be carried through
to the other "#else" branch with an appropriately coded devm_clk_get() as
well. I suspect it needs more than the trivial code added by
commit 19a1d332cc8c.
I'll check this out further an update my for-next as required.
Thanks
Greg
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
^ permalink raw reply
* linux-next: manual merge of the trivial tree with Linus' tree
From: Stephen Rothwell @ 2012-06-29 4:36 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Wanpeng Li, Hugh Dickins,
Konstantin Khlebnikov, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 1456 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
include/linux/mmzone.h between commit 89abfab133ef ("mm/memcg: move
reclaim_stat into lruvec") from Linus' tree and commit 46028e6d10cb ("mm:
cleanup on the comments of zone_reclaim_stat") from the trivial tree.
The former moved the code that was updated by the latter. I applied the
latter to the new position (see below).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/mmzone.h
index 2427706,5463177..0000000
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@@ -185,25 -185,8 +185,25 @@@ static inline int is_unevictable_lru(en
return (lru == LRU_UNEVICTABLE);
}
+struct zone_reclaim_stat {
+ /*
+ * The pageout code in vmscan.c keeps track of how many of the
- * mem/swap backed and file backed pages are refeferenced.
++ * mem/swap backed and file backed pages are referenced.
+ * The higher the rotated/scanned ratio, the more valuable
+ * that cache is.
+ *
+ * The anon LRU stats live in [0], file LRU stats in [1]
+ */
+ unsigned long recent_rotated[2];
+ unsigned long recent_scanned[2];
+};
+
struct lruvec {
struct list_head lists[NR_LRU_LISTS];
+ struct zone_reclaim_stat reclaim_stat;
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
+ struct zone *zone;
+#endif
};
/* Mask used at gathering information at once (see memcontrol.c) */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the sound-asoc tree
From: Stephen Rothwell @ 2012-06-29 3:38 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: linux-next, linux-kernel, Vipin Kumar, Rajeev Kumar
[-- Attachment #1: Type: text/plain, Size: 818 bytes --]
Hi all,
After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
sound/soc/codecs/spdif_receiver.o: In function `init_module':
spdif_receiver.c:(.init.text+0x0): multiple definition of `init_module'
sound/soc/codecs/spdif_transciever.o:spdif_transciever.c:(.init.text+0x0): first defined here
sound/soc/codecs/spdif_receiver.o: In function `cleanup_module':
spdif_receiver.c:(.exit.text+0x0): multiple definition of `cleanup_module'
sound/soc/codecs/spdif_transciever.o:spdif_transciever.c:(.exit.text+0x0): first defined here
Caused by commit cdf605255c2b ("ASoC: spdif_receiver: Add support for
spdif in Audio Codec").
I have used the sound-asoc tree from next-20120628 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the drm tree with Linus' tree
From: Stephen Rothwell @ 2012-06-29 3:30 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Daniel Vetter
[-- Attachment #1: Type: text/plain, Size: 542 bytes --]
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit 7aa1e7f06d6e ("Revert
"drm/i915: allow PCH PWM override on IVB"") from Linus' tree and commit
7cf416014813 ("drm/i915: clear up backlight #define confusion on gen4+")
from the drm tree.
The former removed the function ivb_pch_pwm_override() that is modified
by the latter, so I did that - or should I have just ignored the revert
patch?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the hid tree
From: Stephen Rothwell @ 2012-06-29 2:47 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 717 bytes --]
Hi Jiri,
After merging the hid tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/hid/Kconfig:698: unexpected 'endif' within menu block
drivers/hid/Kconfig:702: unexpected 'endmenu' within if block
drivers/Kconfig:151: 'endmenu' in different file than 'menu'
drivers/hid/Kconfig:79: location of the 'menu'
arch/powerpc/kvm/Kconfig:153: syntax error
drivers/Kconfig:1: missing end statement for this entry
Caused by bad merge 8494746044bf ("Merge branch 'roccat' into
for-next"). This added a second copy of
menu "Special HID drivers"
I have used the hid tree from next-20120628 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the m68knommu tree with Linus' tree
From: Stephen Rothwell @ 2012-06-29 1:33 UTC (permalink / raw)
To: Greg Ungerer; +Cc: linux-next, linux-kernel, Steven King
[-- Attachment #1: Type: text/plain, Size: 3154 bytes --]
Hi Greg,
Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/platform/coldfire/clk.c between commit 19a1d332cc8c
("m68knommu: define a local devm_clk_get() function") from Linus' tree
and commit a0412a2ddaa3 ("m68knommu: Add support for the Coldfire
m5441x") from the m68knommu tree.
I fixed it up (I think - see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/m68k/platform/coldfire/clk.c
index 44da406,d96405c..0000000
--- a/arch/m68k/platform/coldfire/clk.c
+++ b/arch/m68k/platform/coldfire/clk.c
@@@ -43,10 -49,102 +49,107 @@@ unsigned long clk_get_rate(struct clk *
}
EXPORT_SYMBOL(clk_get_rate);
+struct clk *devm_clk_get(struct device *dev, const char *id)
+{
+ return NULL;
+}
+EXPORT_SYMBOL(devm_clk_get);
+
+ #else
+ static DEFINE_SPINLOCK(clk_lock);
+
+ struct clk *clk_get(struct device *dev, const char *id)
+ {
+ const char *clk_name = dev ? dev_name(dev) : id ? id : NULL;
+ struct clk *clk;
+ unsigned i;
+
+ for (i = 0; (clk = mcf_clks[i]) != NULL; ++i)
+ if (!strcmp(clk->name, clk_name))
+ return clk;
+ pr_warn("clk_get: didn't find clock %s\n", clk_name);
+ return ERR_PTR(-ENOENT);
+ }
+ EXPORT_SYMBOL(clk_get);
+
+ int clk_enable(struct clk *clk)
+ {
+ unsigned long flags;
+ spin_lock_irqsave(&clk_lock, flags);
+ if ((clk->enabled++ == 0) && clk->clk_ops)
+ clk->clk_ops->enable(clk);
+ spin_unlock_irqrestore(&clk_lock, flags);
+
+ return 0;
+ }
+ EXPORT_SYMBOL(clk_enable);
+
+ void clk_disable(struct clk *clk)
+ {
+ unsigned long flags;
+ spin_lock_irqsave(&clk_lock, flags);
+ if ((--clk->enabled == 0) && clk->clk_ops)
+ clk->clk_ops->disable(clk);
+ spin_unlock_irqrestore(&clk_lock, flags);
+ }
+ EXPORT_SYMBOL(clk_disable);
+
+ void clk_put(struct clk *clk)
+ {
+ if (clk->enabled != 0)
+ pr_warn("clk_put %s still enabled\n", clk->name);
+ }
+ EXPORT_SYMBOL(clk_put);
+
+ unsigned long clk_get_rate(struct clk *clk)
+ {
+ return clk->rate;
+ }
+ EXPORT_SYMBOL(clk_get_rate);
+
-
/***************************************************************************/
+
+ void __clk_init_enabled(struct clk *clk)
+ {
+ clk->enabled = 1;
+ clk->clk_ops->enable(clk);
+ }
+
+ void __clk_init_disabled(struct clk *clk)
+ {
+ clk->enabled = 0;
+ clk->clk_ops->disable(clk);
+ }
+
+ static void __clk_enable0(struct clk *clk)
+ {
+ __raw_writeb(clk->slot, MCFPM_PPMCR0);
+ }
+
+ static void __clk_disable0(struct clk *clk)
+ {
+ __raw_writeb(clk->slot, MCFPM_PPMSR0);
+ }
+
+ struct clk_ops clk_ops0 = {
+ .enable = __clk_enable0,
+ .disable = __clk_disable0,
+ };
+
+ #ifdef MCFPM_PPMCR1
+ static void __clk_enable1(struct clk *clk)
+ {
+ __raw_writeb(clk->slot, MCFPM_PPMCR1);
+ }
+
+ static void __clk_disable1(struct clk *clk)
+ {
+ __raw_writeb(clk->slot, MCFPM_PPMSR1);
+ }
+
+ struct clk_ops clk_ops1 = {
+ .enable = __clk_enable1,
+ .disable = __clk_disable1,
+ };
+ #endif /* MCFPM_PPMCR1 */
+ #endif /* MCFPM_PPMCR0 */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: VFIO compile failure on i386 allmodconfig in linux-next
From: Alex Williamson @ 2012-06-28 22:25 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next
In-Reply-To: <20120628175712.GA20250@windriver.com>
On Thu, 2012-06-28 at 13:57 -0400, Paul Gortmaker wrote:
> Hi Alex,
>
> Just a heads up that the i386 allmodconfig failed on VFIO, in case
> you didn't see it.
>
> http://kisskb.ellerman.id.au/kisskb/buildresult/6603285/
>
> arch/x86/include/asm/uaccess_32.h:211:26: error: call to 'copy_from_user_overflow' declared with attribute error: copy_from_user() buffer size is not provably correct
> make[4]: *** [drivers/vfio/pci/vfio_pci_config.o] Error 1
Thank you for the report. This looks bogus to me, it's complaining
about a copy_from_user into an __le32 because it can't determine the
number of bytes to be copied. That number is a parameter to the
function, but the function is static and only called with values of 1, 2
or 4. I've added a test that seems to make the compiler happy, so this
will be fixed in tomorrow's tree. Thanks!
Alex
^ permalink raw reply
* Re: linux-next: Tree for Jun 27 (eliminated_printk)
From: Shuah Khan @ 2012-06-28 21:03 UTC (permalink / raw)
To: Matthew Garrett
Cc: shuahkhan, Stephen Rothwell, Randy Dunlap, linux-next, LKML,
Joe Perches
In-Reply-To: <20120628201601.GB12471@srcf.ucam.org>
On Thu, 2012-06-28 at 21:16 +0100, Matthew Garrett wrote:
> On Thu, Jun 28, 2012 at 02:14:19PM -0600, Shuah Khan wrote:
>
> > Has this bean fixed in June 28th tree??
>
> I dropped the patches from my -next branch. I'll wait to hear that the
> pre-requisites have gone in - alternatively, Joe, feel free to add my
> SoB and have them pushed through whichever tree takes the first in the
> series.
>
ok Worked around for now by enabling CONFIG_THINKPAD_ACPI_DEBUG and
CONFIG_FUJITSU_LAPTOP_DEBUG. Just in case others need a work around.
-- Shuah
^ permalink raw reply
* Re: linux-next: Tree for Jun 27 (eliminated_printk)
From: Matthew Garrett @ 2012-06-28 20:16 UTC (permalink / raw)
To: Shuah Khan; +Cc: Stephen Rothwell, Randy Dunlap, linux-next, LKML, Joe Perches
In-Reply-To: <1340914459.3821.0.camel@lorien2>
On Thu, Jun 28, 2012 at 02:14:19PM -0600, Shuah Khan wrote:
> Has this bean fixed in June 28th tree??
I dropped the patches from my -next branch. I'll wait to hear that the
pre-requisites have gone in - alternatively, Joe, feel free to add my
SoB and have them pushed through whichever tree takes the first in the
series.
--
Matthew Garrett | mjg59@srcf.ucam.org
^ permalink raw reply
* Re: linux-next: Tree for Jun 27 (eliminated_printk)
From: Shuah Khan @ 2012-06-28 20:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: shuahkhan, Matthew Garrett, Randy Dunlap, linux-next, LKML,
Joe Perches
In-Reply-To: <20120628085226.af0623e39a282192935047c3@canb.auug.org.au>
On Thu, 2012-06-28 at 08:52 +1000, Stephen Rothwell wrote:
> Hi Matthew,
>
> One for you ...
>
> On Wed, 27 Jun 2012 09:29:29 -0700 Joe Perches <joe@perches.com> wrote:
> >
> > On Wed, 2012-06-27 at 09:25 -0700, Randy Dunlap wrote:
> > >
> > > on i386:
> > >
> > > drivers/platform/x86/thinkpad_acpi.c: In function 'drv_acpi_handle_init':
> > > drivers/platform/x86/thinkpad_acpi.c:684:2: error: implicit declaration of function 'eliminated_printk'
> > >
> > > drivers/platform/x86/fujitsu-laptop.c: In function 'call_fext_func':
> > > drivers/platform/x86/fujitsu-laptop.c:223:3: error: implicit declaration of function 'eliminated_printk'
> > >
> > >
> > > Full randconfig file is attached.
> >
> > Thanks Randy.
> >
> > This patch depends on the first patch in the series
> > which hasn't been applied.
> >
> > https://lkml.org/lkml/2012/6/17/229
> > https://lkml.org/lkml/2012/6/17/231
Has this bean fixed in June 28th tree??
-- Shuah
>
>
^ permalink raw reply
* VFIO compile failure on i386 allmodconfig in linux-next
From: Paul Gortmaker @ 2012-06-28 17:57 UTC (permalink / raw)
To: alex.williamson; +Cc: linux-next
Hi Alex,
Just a heads up that the i386 allmodconfig failed on VFIO, in case
you didn't see it.
http://kisskb.ellerman.id.au/kisskb/buildresult/6603285/
arch/x86/include/asm/uaccess_32.h:211:26: error: call to 'copy_from_user_overflow' declared with attribute error: copy_from_user() buffer size is not provably correct
make[4]: *** [drivers/vfio/pci/vfio_pci_config.o] Error 1
Paul.
^ permalink raw reply
* Re: Request VFIO inclusion in linux-next
From: Dan Carpenter @ 2012-06-28 6:44 UTC (permalink / raw)
To: Alex Williamson
Cc: Stephen Rothwell, Benjamin Herrenschmidt, kvm,
Alexey Kardashevskiy, Greg Kroah-Hartman, linux-kernel,
qemu-devel, chrisw, iommu, linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-pci, Andrew Morton, Linus Torvalds, David Gibson
In-Reply-To: <1340825003.1207.224.camel-xdHQ/5r00wBBDLzU/O5InQ@public.gmane.org>
On Wed, Jun 27, 2012 at 01:23:23PM -0600, Alex Williamson wrote:
> On Wed, 2012-06-27 at 15:37 +0300, Dan Carpenter wrote:
> > On Mon, Jun 25, 2012 at 10:55:52PM -0600, Alex Williamson wrote:
> > > Hi,
> > >
> > > VFIO has been kicking around for well over a year now and has been
> > > posted numerous times for review. The pre-requirements are finally
> > > available in linux-next (or will be in the 20120626 build) so I'd like
> > > to request a new branch be included in linux-next with a goal of being
> > > accepted into v3.6.
> > >
> >
> > Could you run Sparse over the driver?
> > http://lwn.net/Articles/205624/
> >
> > It reports a bunch of endian problems. Some are definitely bugs
> > like:
> > *prev |= cpu_to_le32((u32)epos << 20);
>
> Done. Mostly just adding annotation, but it did find a bug or two.
> Should be cleaned up in tomorrow's next. Thanks for the report,
>
Cool. I have some Smatch fixes as well. I've updated them to apply
on top of today's linux-next.
regards,
dan carpenter
^ permalink raw reply
* linux-next: Tree for June 28
From: Stephen Rothwell @ 2012-06-28 6:33 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 29929 bytes --]
Hi all,
Changes since 20120627:
The wireless-next tree gained a conflict against the net-next tree.
The l2-mtd tree gained a conflict against the m68k tree.
The device-mapper tree lost its build failure.
----------------------------------------------------------------------------
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/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,
sparc64 and arm 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 191 trees (counting Linus' and 26 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. And to Paul
Gortmaker for triage and bug fixes.
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 (d1346a6 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux)
Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
Merging kbuild-current/rc-fixes (464076b Makefile: Do not call cc-option before including the arch's Makefile)
Merging arm-current/fixes (10aa5a3 SPI: fix over-eager devm_xxx() conversion)
Merging m68k-current/for-linus (d8ce726 m68k: Use generic strncpy_from_user(), strlen_user(), and strnlen_user())
Merging powerpc-merge/merge (7c0482e powerpc/irq: Fix another case of lazy IRQ state getting out of sync)
Merging sparc/master (6a8ead0 sparc32: Remove superfluous extern declarations for prom_*() functions)
Merging net/master (a969dd1 Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can)
Merging sound-current/for-linus (6e1c39c ALSA: hda - Fix power-map regression for HP dv6 & co)
Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging wireless/master (c9015b2 mwifiex: fix memory leak associated with IE manamgement)
Merging driver-core.current/driver-core-linus (116e90b syslog: fill buffer with more than a single message for SYSLOG_ACTION_READ)
Merging tty.current/tty-linus (6b16351 Linux 3.5-rc4)
Merging usb.current/usb-linus (3fcc8f9 USB: CP210x Add 10 Device IDs)
Merging staging.current/staging-linus (6b16351 Linux 3.5-rc4)
Merging char-misc.current/char-misc-linus (6b16351 Linux 3.5-rc4)
Merging input-current/for-linus (2177905 Input: fix input.h kernel-doc warning)
Merging md-current/for-linus (aba336b md: raid1/raid10: fix problem with merge_bvec_fn)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (c475c06 hwrng: atmel-rng - fix data valid check)
Merging ide/master (39a50b4 Merge branch 'hfsplus')
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (790b9d4 Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
Merging arm/for-next (4d0d790 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (dee8c1b ARM: perf: remove arm_perf_pmu_ids global enumeration)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (672552a blackfin: fix build after add bf60x mach/pm.h)
Merging c6x/for-linux-next (485802a Linux 3.5-rc3)
Merging cris/for-next (2608747 CRIS: Remove VCS simulator specific code)
Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
Merging ia64/next (f28fa72 [IA64] Port OOM changes to ia64_do_page_fault)
Merging m68k/for-next (a8ab984 m68k: Remove never used asm/shm.h)
Merging m68knommu/for-next (cec069e m68knommu: Add clk definitions for m532x.)
Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd)
Merging mips/mips-for-linux-next (1f04189 Merge branch 'next/loongson1b' into mips-for-linux-next)
Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic syscall)
Merging parisc/for-next (4c01acc [PARISC] fix code to find libgcc)
Merging powerpc/next (2074b1d powerpc: Fix irq distribution)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (f8d5842 powerpc: Option FB_FSL_DIU is not really optional for mpc512x)
Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0)
Merging s390/features (a7df7a9 s390/ipl: Fix ipib handling for "dumpreipl" shutdown action)
Merging sh/sh-latest (7b98cf0 Merge branch 'common/pfc' into sh-latest)
Merging sparc-next/master (31a6710 Fix blocking allocations called very early during bootup)
Merging tile/master (7a9349b bounce: allow use of bounce pool via config option)
Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
Merging ceph/master (26ce171 libceph: fix NULL dereference in reset_connection())
CONFLICT (content): Merge conflict in net/ceph/osd_client.c
Merging cifs/for-next (4d0b178 CIFS: Add SMB2 credits support)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (5a52c0d eCryptfs: Initialize empty lower files when opening them)
Merging ext3/for_next (7d5a4b0 quota: fix checkpatch.pl warning by replacing <asm/uaccess.h> with <linux/uaccess.h>)
Merging ext4/dev (b22b1f1 ext4: don't set i_flags in EXT4_IOC_SETFLAGS)
Merging fuse/for-next (203627b fuse: fix blksize calculation)
Merging gfs2/master (666d1d8 GFS2: Combine functions get_local_rgrp and gfs2_inplace_reserve)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (d4c2898 Define ENONAMESERVICE and ENAMEUNKNOWN to indicate name service errors)
Merging nfsd/nfsd-next (7df302f NFSD: TEST_STATEID should not return NFS4ERR_STALE_STATEID)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (5fcb08b 9p: BUG before corrupting memory)
Merging ubifs/linux-next (903e0e4 UBI: correct usage of IS_ENABLED())
Merging xfs/for-next (9a8d2fd xfs: remove xlog_t typedef)
CONFLICT (content): Merge conflict in fs/xfs/xfs_log_priv.h
CONFLICT (content): Merge conflict in fs/xfs/xfs_log.c
Merging vfs/for-next (01aa470 do_dentry_open(): close the race with mark_files_ro() in failure exit)
CONFLICT (content): Merge conflict in fs/cifs/dir.c
Merging pci/next (35e7f73 Merge branch 'topic/huang-d3cold-v7' into next)
CONFLICT (content): Merge conflict in drivers/pci/quirks.c
CONFLICT (content): Merge conflict in drivers/pci/pci.c
Merging hid/for-next (f79185b Merge branch 'uhid' into for-next)
CONFLICT (content): Merge conflict in drivers/hid/Kconfig
Merging quilt/i2c (d170f6c i2c/writing-clients: Mention module_i2c_driver())
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging i2c-embedded/i2c-embedded/for-next (0f009a9 i2c: tegra: make all resource allocation through devm_*)
Merging quilt/jdelvare-hwmon (3c1aae2 hwmon: struct x86_cpu_id arrays can be __initconst)
Merging hwmon-staging/hwmon-next (56e42ea hwmon: (applesmc) Skip sensor mapping)
Merging v4l-dvb/master (db04b6c Merge tag 'v3.5-rc4')
Merging kbuild/for-next (c6ff25b Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (4503379 localmodconfig: Add debug environment variable LOCALMODCONFIG_DEBUG)
Merging libata/NEXT (2fff275 PATA host controller driver for ep93xx)
Merging infiniband/for-next (a323e3f Merge branch 'cma' into for-next)
Merging acpi/next (4e86d6d Merge branch 'turbostat-v2' into next)
CONFLICT (content): Merge conflict in drivers/pci/pci-acpi.c
Merging cpuidle/cpuidle-next (1cdb80c cpuidle: coupled: add parallel barrier function)
CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (e18907c firewire: ohci: initialize multiChanMode bits after reset)
Merging ubi/linux-next (f8f5701 Linux 3.5-rc1)
Merging dlm/next (aefee56 dlm: fix missing dir remove)
Merging scsi/for-next (6ef2448 [SCSI] qla4xxx: Update driver version to 5.02.00-k18)
Merging target-updates/for-next (4318efc target: move unmap to struct spc_ops)
Merging target-merge/for-next-merge (cfaf025 Linux 3.5-rc2)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6df8ea3 merge: devel rnc-devel fixes)
Merging slave-dma/next (46fb3f8 dma: tegra: set DMA_CYCLIC capability)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (c10237e Revert "ipv4: tcp: dont cache unconfirmed intput dst")
CONFLICT (content): Merge conflict in drivers/net/caif/caif_hsi.c
Merging wireless-next/master (bf52592 ath9k: Fix compilation breakage)
CONFLICT (content): Merge conflict in drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
Merging bluetooth/master (b82c29d Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
Merging mtd/master (ea3b2ea mtd: nand: initialize bitflip_threshold prior to BBT scanning)
Merging l2-mtd/master (ea3b6ef mtd: fix bogus inequation)
CONFLICT (content): Merge conflict in drivers/mtd/maps/uclinux.c
Merging crypto/master (26c8aae crypto: algapi - Fix hang on crypto allocation)
Merging drm/drm-next (0317c6c drm/i915/bios: cleanup return type of intel_parse_bios())
Merging sound/for-next (557cf82 Merge branch 'topic/hda' into for-next)
Merging sound-asoc/for-next (395bc59 Merge branch 'for-3.6' into asoc-next)
Merging quilt/rr (231e4d6 Taint kernel when lve module is loaded)
Merging input/next (84b63ad Input: nomadik-ske-keypad - get rid of multiple interrupts)
Merging input-mt/for-next (27c347d Input: MT - fix null pointer warning)
Merging cgroup/for-next (f9b6023f Merge branch 'for-3.5-fixes' into for-next)
Merging block/for-next (f45d342 Merge branch 'for-linus' into for-next)
Merging quilt/device-mapper (31939b3 dm-thin will be most likely used with a block size that is a power of two. So it should be optimized for this case.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (ed99260 mmc: tmio: remove a duplicated comment line)
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
Merging slab/for-next (43d7786 slub: refactoring unfreeze_partials())
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (aba336b md: raid1/raid10: fix problem with merge_bvec_fn)
Merging mfd/for-next (58eec73 mfd: Add Maxim 77686 driver)
Merging battery/master (85a392d test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties)
Applying: ACPI-Thermal: fix for an API change
Merging fbdev/fbdev-next (0f90fa5 Merge branch 'planes' of git://linuxtv.org/pinchartl/fbdev into fbdev-next)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (05dd0f5 OMAPDSS: DISPC: Update Accumulator configuration for chroma plane)
Merging regulator/for-next (d0d9b39 Merge branch 'regulator-core' into regulator-next)
Merging security/next (3072928 tpm: check the chip reference before using it)
Merging selinux/master (c737f82 SELinux: remove unused common_audit_data in flush_unauthorized_files)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (e68261c char/ipmi: remove local ioctl defines replaced by generic ones)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (af4d900 Merge branches 'iommu/fixes', 'groups' and 'arm/tegra' into next)
Merging vfio/next (d6f7d48 vfio: Add PCI device driver)
Merging osd/linux-next (8b56a30 exofs: Add SYSFS info for autologin/pNFS export)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (954bd6d lm8333: Fix check ordering)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (c4db9a7 Merge branch 'pm-domains' into linux-next)
Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
Merging edac/linux_next (a92cdec Merge branch 'devel' into next)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
CONFLICT (content): Merge conflict in Documentation/edac.txt
Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
Merging tip/auto-latest (912ca15 Merge branch 'core/urgent')
CONFLICT (content): Merge conflict in mm/slub.c
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in drivers/hwmon/coretemp.c
Merging rcu/rcu/next (f0fd40c rcu: Allow RCU quiescent-state forcing to be preempted)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
Merging kvm/linux-next (ae7a2a3 KVM: host side for eoi optimization)
Merging kvm-ppc/kvm-ppc-next (5e5054c booke: Added crit/mc exception handler for e500v2)
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
Merging xen-two/linux-next (e4e7b82 Merge branch 'stable/for-linus-3.6' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging workqueues/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging drivers-x86/linux-next (3fc1ae3 ACER: Add support for accelerometer sensor)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (dabefce Merge branch 'regmap-page' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (9d4f209 leds-lp5523: BUG() in error handling in probe())
Merging driver-core/driver-core-next (f2c32a8 Extcon: Arizona: Add driver for Wolfson Arizona class devices)
CONFLICT (content): Merge conflict in drivers/extcon/extcon_gpio.c
Merging tty/tty-next (0a44ab4 tty: note race we need to fix)
Merging usb/usb-next (afd6bb3 Fix OMAP EHCI suspend/resume failure (i693) '354ab856' causes)
Merging staging/staging-next (2da049b staging: gdm72xx: fix an skb memory leak)
CONFLICT (content): Merge conflict in drivers/staging/gdm72xx/netlink_k.c
Merging char-misc/char-misc-next (726917f mei: revamp host buffer interface function)
Merging tmem/linux-next (3bebf5b Merge branch 'stable/for-linus-3.6' into linux-next)
Merging writeback/writeback-for-next (331cbde writeback: Fix some comment errors)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (8df6653 pinctrl: pinctrl-imx: fix map setting problem if NO_PAD_CTL is set)
Merging moduleh/for-sfr (f9e1b2b tile: fix compile failure on start_kernel in setup.c)
Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
Merging kmap_atomic/kmap_atomic (b4d87ad pipe: remove KM_USER0 from comments)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (5414687 MAINTAINERS: add remoteproc's git)
CONFLICT (content): Merge conflict in drivers/remoteproc/remoteproc_core.c
Merging irqdomain/irqdomain/next (aed9804 irqdomain: Make ops->map hook optional)
Merging gpio/gpio/next (3e11f7b gpio/generic: initialize basic_mmio_gpio shadow variables properly)
Merging arm-soc/for-next (513bd72 Merge branch 'fixes' into for-next)
Merging ep93xx/ep93xx-for-next (9b6a359 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging renesas/next (386213b Merge branch 'renesas-sh7372' into renesas-next)
Merging s5p/for-next (99f9f4c Merge branch 'v3.5-samsung-fixes-1' into for-next)
Merging tegra/for-next (1412fcf Merge branch 'for-3.6/defconfig' into for-next)
Merging kvmtool/master (5fffd63 kvm tools: set the HYPERVISOR flag in cpuid)
Merging dma-mapping/dma-mapping-next (17f449a Merge remote branch 'dma-public/fixes-for-linus' into for-next)
Merging dma-buf/for-next (b48b2c3 openrisc: use generic strnlen_user() function)
Merging userns/for-next (491fa9e userns: Allow the usernamespace support to build after the removal of usbfs)
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging signal/for-next (2c95605 Uninclude linux/freezer.h)
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: selinux: fix something
Applying: memory hotplug: fix invalid memory access caused by stale kswapd pointer
Applying: memory-hotplug-fix-invalid-memory-access-caused-by-stale-kswapd-pointer-fix
Applying: drivers/rtc/rtc-spear.c: fix use-after-free in spear_rtc_remove()
Applying: mn10300: move setup_jiffies_interrupt() to cevt-mn10300.c
Applying: mn10300: remove duplicate definition of PTRACE_O_TRACESYSGOOD
Applying: mn10300: kernel/internal.h needs <linux/irqreturn.h>
Applying: mn10300: kernel/traps.c needs <linux/export.h>
Applying: mn10300: mm/dma-alloc.c needs <linux/export.h>
Applying: mn10300: use "#elif defined(CONFIG_*)" instead of "#elif CONFIG_*"
Applying: ocfs2: fix NULL pointer dereference in __ocfs2_change_file_space()
Applying: c/r: prctl: less paranoid prctl_set_mm_exe_file()
Applying: drivers/gpio/devres.c: export devm_gpio_request_one() to modules
Applying: mm, thp: abort compaction if migration page cannot be charged to memcg
Applying: cciss: fix incorrect scsi status reporting
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: arch/x86/include/asm/spinlock.h: fix comment
Applying: arch/x86/kernel/cpu/perf_event_intel_uncore.h: make UNCORE_PMU_HRTIMER_INTERVAL 64-bit
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: time: don't inline EXPORT_SYMBOL functions
Applying: thermal: fix potential out-of-bounds memory access
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: drivers/scsi/ufs: use module_pci_driver
Applying: drivers/scsi/ufs: reverse the ufshcd_is_device_present logic
Applying: drivers/scsi/ufs: fix incorrect return value about SUCCESS and FAILED
Applying: drivers/scsi/atp870u.c: fix bad use of udelay
Applying: vfs: increment iversion when a file is truncated
Applying: fs: push rcu_barrier() from deactivate_locked_super() to filesystems
Applying: hfs: push lock_super down
Applying: hfs: get rid of lock_super
Applying: hfs: remove extra mdb write on unmount
Applying: hfs: simplify a bit checking for R/O
Applying: hfs: introduce VFS superblock object back-reference
Applying: hfs: get rid of hfs_sync_super
Applying: hfs-get-rid-of-hfs_sync_super-checkpatch-fixes
Applying: fs/xattr.c:getxattr(): improve handling of allocation failures
Applying: fs: add link restrictions
Applying: mm/slab: remove duplicate check
Applying: slab: move FULL state transition to an initcall
Applying: vmalloc: walk vmap_areas by sorted list instead of rb_next()
Applying: mm: make vb_alloc() more foolproof
Applying: mm-make-vb_alloc-more-foolproof-fix
Applying: memcg: rename MEM_CGROUP_STAT_SWAPOUT as MEM_CGROUP_STAT_SWAP
Applying: memcg: rename MEM_CGROUP_CHARGE_TYPE_MAPPED as MEM_CGROUP_CHARGE_TYPE_ANON
Applying: memcg: remove MEM_CGROUP_CHARGE_TYPE_FORCE
Applying: swap: allow swap readahead to be merged
Applying: documentation: update how page-cluster affects swap I/O
Applying: mm: account the total_vm in the vm_stat_account()
Applying: mm: compaction: handle incorrect MIGRATE_UNMOVABLE type pageblocks
Applying: mm-compaction-handle-incorrect-migrate_unmovable-type-pageblocks-fix
Applying: mm/buddy: cleanup on should_fail_alloc_page
Applying: mm: prepare for removal of obsolete /proc/sys/vm/nr_pdflush_threads
Applying: hugetlb: rename max_hstate to hugetlb_max_hstate
Applying: hugetlb: don't use ERR_PTR with VM_FAULT* values
Applying: hugetlb: add an inline helper for finding hstate index
Applying: hugetlb: use mmu_gather instead of a temporary linked list for accumulating pages
Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb
Applying: hugetlb: simplify migrate_huge_page()
Applying: hugetlb: add a list for tracking in-use HugeTLB pages
Applying: hugetlb: make some static variables global
Applying: hugeltb: mark hugelb_max_hstate __read_mostly
Applying: mm/hugetlb: add new HugeTLB cgroup
Applying: hugetlb/cgroup: Mark root_h_cgroup static
Applying: hugetlb/cgroup: add the cgroup pointer to page lru
Applying: hugetlb/cgroup: add charge/uncharge routines for hugetlb cgroup
Applying: hugetlb/cgroup: add support for cgroup removal
Applying: hugetlb/cgroup: add hugetlb cgroup control files
Applying: hugetlb/cgroup: migrate hugetlb cgroup info from oldpage to new page during migration
Applying: hugetlb/cgroup: add HugeTLB controller documentation
Applying: hugetlb: move all the in use pages to active list
Applying: hugetlb/cgroup: assign the page hugetlb cgroup when we move the page to active list.
Applying: hugetlb/cgroup: remove exclude and wakeup rmdir calls from migrate
Applying: mm, oom: do not schedule if current has been killed
Applying: mm/memblock.c:memblock_double_array(): cosmetic cleanups
Applying: memcg: remove check for signal_pending() during rmdir()
Applying: memcg: clean up force_empty_list() return value check
Applying: memcg: mem_cgroup_move_parent() doesn't need gfp_mask
Applying: memcg: make mem_cgroup_force_empty_list() return bool
Applying: memcg-make-mem_cgroup_force_empty_list-return-bool-fix
Applying: mm/compaction: cleanup on compaction_deferred
Applying: memcg: prevent OOM with too many dirty pages
Applying: tmpfs: implement NUMA node interleaving
Applying: tmpfs-implement-numa-node-interleaving-fix
Applying: avr32/mm/fault.c: port OOM changes to do_page_fault
Applying: avr32-mm-faultc-port-oom-changes-to-do_page_fault-fix
Applying: clk: add non CONFIG_HAVE_CLK routines
Applying: clk: remove redundant depends on from drivers/Kconfig
Applying: i2c/i2c-pxa: remove conditional compilation of clk code
Applying: usb/marvell: remove conditional compilation of clk code
Applying: usb/musb: remove conditional compilation of clk code
Applying: ata/pata_arasan: remove conditional compilation of clk code
Applying: net/c_can: remove conditional compilation of clk code
Applying: net/stmmac: remove conditional compilation of clk code
Applying: gadget/m66592: remove conditional compilation of clk code
Applying: gadget/r8a66597: remove conditional compilation of clk code
Applying: usb/host/r8a66597: remove conditional compilation of clk code
Applying: clk: validate pointer in __clk_disable()
Applying: NMI watchdog: fix for lockup detector breakage on resume
Applying: kmsg: /dev/kmsg - properly return possible copy_from_user() failure
Applying: printk: add generic functions to find KERN_<LEVEL> headers
Applying: printk-add-generic-functions-to-find-kern_level-headers-fix
Applying: printk: add kern_levels.h to make KERN_<LEVEL> available for asm use
Applying: arch: remove direct definitions of KERN_<LEVEL> uses
Applying: btrfs: use printk_get_level and printk_skip_level, add __printf, fix fallout
Applying: btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-fix
Applying: btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-checkpatch-fixes
Applying: sound: use printk_get_level and printk_skip_level
Applying: printk: convert the format for KERN_<LEVEL> to a 2 byte pattern
Applying: printk: only look for prefix levels in kernel messages
Applying: printk: remove the now unnecessary "C" annotation for KERN_CONT
Applying: vsprintf: add %pMR for Bluetooth MAC address
Applying: Documentation/printk-formats.txt: add description for %pMR
Applying: lib/vsprintf.c: remind people to update Documentation/printk-formats.txt when adding printk formats
Applying: drivers/video/backlight/atmel-pwm-bl.c: use devm_ functions
Applying: drivers/video/backlight/ot200_bl.c: use devm_ functions
Applying: drivers/video/backlight/lm3533_bl.c: use devm_ functions
Applying: backlight: atmel-pwm-bl: use devm_gpio_request()
Applying: backlight: ot200_bl: use devm_gpio_request()
Applying: backlight: tosa_lcd: use devm_gpio_request()
Applying: backlight: tosa_bl: use devm_gpio_request()
Applying: backlight: lms283gf05: use devm_gpio_request()
Applying: backlight: corgi_lcd: use devm_gpio_request()
Applying: backlight: l4f00242t03: export and use devm_gpio_request_one()
Applying: string: introduce memweight()
Applying: string-introduce-memweight-fix
Applying: string: fix build error caused by memweight() introduction
Applying: qnx4fs: use memweight()
Applying: dm: use memweight()
Applying: affs: use memweight()
Applying: video/uvc: use memweight()
Applying: ocfs2: use memweight()
Applying: ext2: use memweight()
Applying: ext3: use memweight()
Applying: ext4: use memweight()
Applying: checkpatch: Update alignment check
Applying: checkpatch: test for non-standard signatures
Applying: checkpatch: check usleep_range() arguments
Applying: drivers/rtc/rtc-coh901331.c: use clk_prepare/unprepare
Applying: drivers/rtc/rtc-coh901331.c: use devm allocation
Applying: drivers/rtc/rtc-ab8500.c: use IRQF_ONESHOT when requesting a threaded IRQ
Applying: rtc: pl031: encapsulate per-vendor ops
Applying: rtc: pl031: use per-vendor variables for special init
Applying: rtc: pl031: fix up IRQ flags
Applying: drivers/rtc/rtc-ab8500.c: use UIE emulation
Applying: drivers-rtc-rtc-ab8500c-use-uie-emulation-checkpatch-fixes
Applying: drivers/rtc/rtc-ab8500.c: remove fix for AB8500 ED version
Applying: drivers/rtc/rtc-r9701.c: avoid second call to rtc_valid_tm()
Applying: drivers/rtc/rtc-r9701.c: check that r9701_set_datetime() succeeded
Applying: hfsplus: use -ENOMEM when kzalloc() fails
Applying: hfsplus: make hfsplus_sync_fs() static
Applying: hfsplus: amend debugging print
Applying: hfsplus: remove useless check
Applying: hfsplus: get rid of write_super
Applying: hfsplus-get-rid-of-write_super-checkpatch-fixes
Applying: kmod: avoid deadlock from recursive kmod call
Applying: fork: use vma_pages() to simplify the code
Applying: fork-use-vma_pages-to-simplify-the-code-fix
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: fs: cachefiles: add support for large files in filesystem caching
Applying: fs-cachefiles-add-support-for-large-files-in-filesystem-caching-fix
Applying: c/r: fcntl: add F_GETOWNER_UIDS option
Merging quilt/akpm (44fcc55 c/r: fcntl: add F_GETOWNER_UIDS option)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the l2-mtd tree with the m68k tree
From: Stephen Rothwell @ 2012-06-28 2:44 UTC (permalink / raw)
To: Artem Bityutskiy
Cc: linux-next, linux-kernel, Geert Uytterhoeven, Greg Ungerer
[-- Attachment #1: Type: text/plain, Size: 858 bytes --]
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/mtd/maps/uclinux.c between commit 363737d66427 ("mtd/uclinux: Use
generic __bss_stop instead of _ebss") from the tree and commit
1dc247e972b3 ("mtd: clean up uclinux.c map driver") from the l2-mtd 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 drivers/mtd/maps/uclinux.c
index c3bb304,ded7916..0000000
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@@ -17,9 -16,6 +16,7 @@@
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
- #include <asm/io.h>
+#include <asm/sections.h>
/****************************************************************************/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the wireless-next tree with the net-next tree
From: Stephen Rothwell @ 2012-06-28 2:40 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Joe Perches, Franky Lin, David Miller,
netdev
[-- Attachment #1: Type: text/plain, Size: 488 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c between commit
2c208890c6d4 ("wireless: Remove casts to same type") from the net-next
tree and commit d610cde30b00 ("brcmfmac: use firmware data buffer
directly for nvram") from the wireless-next tree.
The latter removed the code modified by the former, so I used the latter.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Jun 27 (eliminated_printk)
From: Stephen Rothwell @ 2012-06-27 22:52 UTC (permalink / raw)
To: Matthew Garrett; +Cc: Randy Dunlap, linux-next, LKML, Joe Perches
In-Reply-To: <1340814569.16533.53.camel@joe2Laptop>
[-- Attachment #1: Type: text/plain, Size: 891 bytes --]
Hi Matthew,
One for you ...
On Wed, 27 Jun 2012 09:29:29 -0700 Joe Perches <joe@perches.com> wrote:
>
> On Wed, 2012-06-27 at 09:25 -0700, Randy Dunlap wrote:
> >
> > on i386:
> >
> > drivers/platform/x86/thinkpad_acpi.c: In function 'drv_acpi_handle_init':
> > drivers/platform/x86/thinkpad_acpi.c:684:2: error: implicit declaration of function 'eliminated_printk'
> >
> > drivers/platform/x86/fujitsu-laptop.c: In function 'call_fext_func':
> > drivers/platform/x86/fujitsu-laptop.c:223:3: error: implicit declaration of function 'eliminated_printk'
> >
> >
> > Full randconfig file is attached.
>
> Thanks Randy.
>
> This patch depends on the first patch in the series
> which hasn't been applied.
>
> https://lkml.org/lkml/2012/6/17/229
> https://lkml.org/lkml/2012/6/17/231
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* commit "ARM: dma-mapping: remove custom consistent dma region"
From: Paul Gortmaker @ 2012-06-27 19:46 UTC (permalink / raw)
To: m.szyprowski; +Cc: kyungmin.park, linux-arm-kernel, linux-next
Hi Marek,
This commit in linux-next:
commit feb930cb9beb75cbe1d1e798870599c3aa1b93ec
Author: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri Jun 8 12:08:32 2012 +0200
ARM: dma-mapping: remove custom consistent dma region
seems to break the at91x40_defconfig (according to git bisect).
CC arch/arm/mm/dma-mapping.o
arch/arm/mm/dma-mapping.c: In function '__dma_alloc':
arch/arm/mm/dma-mapping.c:575: error: macro "__alloc_from_pool" requires 4 arguments, but only 2 given
arch/arm/mm/dma-mapping.c:575: error: '__alloc_from_pool' undeclared (first use in this function)
arch/arm/mm/dma-mapping.c:575: error: (Each undeclared identifier is reported only once
arch/arm/mm/dma-mapping.c:575: error: for each function it appears in.)
make[2]: *** [arch/arm/mm/dma-mapping.o] Error 1
make[1]: *** [arch/arm/mm/dma-mapping.o] Error 2
See http://kisskb.ellerman.id.au/kisskb/buildresult/6596769/ for a full log.
Please have a look when you get a chance.
Thanks,
Paul.
^ permalink raw reply
* Re: Request VFIO inclusion in linux-next
From: Alex Williamson @ 2012-06-27 19:23 UTC (permalink / raw)
To: Dan Carpenter
Cc: Stephen Rothwell, Benjamin Herrenschmidt, kvm,
Alexey Kardashevskiy, Greg Kroah-Hartman, linux-kernel,
qemu-devel, chrisw, iommu, linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-pci, Andrew Morton, Linus Torvalds, David Gibson
In-Reply-To: <20120627123733.GA5449@mwanda>
On Wed, 2012-06-27 at 15:37 +0300, Dan Carpenter wrote:
> On Mon, Jun 25, 2012 at 10:55:52PM -0600, Alex Williamson wrote:
> > Hi,
> >
> > VFIO has been kicking around for well over a year now and has been
> > posted numerous times for review. The pre-requirements are finally
> > available in linux-next (or will be in the 20120626 build) so I'd like
> > to request a new branch be included in linux-next with a goal of being
> > accepted into v3.6.
> >
>
> Could you run Sparse over the driver?
> http://lwn.net/Articles/205624/
>
> It reports a bunch of endian problems. Some are definitely bugs
> like:
> *prev |= cpu_to_le32((u32)epos << 20);
Done. Mostly just adding annotation, but it did find a bug or two.
Should be cleaned up in tomorrow's next. Thanks for the report,
Alex
^ permalink raw reply
* Re: linux-next: Tree for Jun 27 (vfio)
From: Alex Williamson @ 2012-06-27 19:20 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, KVM
In-Reply-To: <4FEB3030.9070900@xenotime.net>
On Wed, 2012-06-27 at 09:09 -0700, Randy Dunlap wrote:
> On 06/26/2012 08:22 PM, Stephen Rothwell wrote:
>
> > Hi all,
> >
> > This tree was not built between each merge, but only after merging all
> > the trees.
> >
> > Changes since 20120626:
> >
> > New tree: vfio
>
>
> on x86_64:
>
> CC [M] drivers/vfio/vfio.o
> drivers/vfio/vfio.c: In function 'vfio_device_release':
> drivers/vfio/vfio.c:412:2: error: 'TASK_NORMAL' undeclared (first use in this function)
> drivers/vfio/vfio.c:412:2: note: each undeclared identifier is reported only once for each function it appears in
> drivers/vfio/vfio.c: In function 'vfio_del_group_dev':
>
> drivers/vfio/vfio.c:695:2: error: 'TASK_UNINTERRUPTIBLE' undeclared (first use in this function)
> drivers/vfio/vfio.c:695:2: error: implicit declaration of function 'schedule'
> *** [drivers/vfio/vfio.o] Error 1
>
>
> Full randconfig file is attached.
Thanks for the report, this should be fixed in tomorrow's tree. Thanks,
Alex
^ permalink raw reply
* Re: linux-next: Tree for Jun 27 (eliminated_printk)
From: Joe Perches @ 2012-06-27 16:29 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML
In-Reply-To: <4FEB340D.3040908@xenotime.net>
On Wed, 2012-06-27 at 09:25 -0700, Randy Dunlap wrote:
> On 06/26/2012 08:22 PM, Stephen Rothwell wrote:
>
> > Hi all,
> >
> > This tree was not built between each merge, but only after merging all
> > the trees.
> >
> > Changes since 20120626:
>
>
>
> on i386:
>
> drivers/platform/x86/thinkpad_acpi.c: In function 'drv_acpi_handle_init':
> drivers/platform/x86/thinkpad_acpi.c:684:2: error: implicit declaration of function 'eliminated_printk'
>
> drivers/platform/x86/fujitsu-laptop.c: In function 'call_fext_func':
> drivers/platform/x86/fujitsu-laptop.c:223:3: error: implicit declaration of function 'eliminated_printk'
>
>
> Full randconfig file is attached.
Thanks Randy.
This patch depends on the first patch in the series
which hasn't been applied.
https://lkml.org/lkml/2012/6/17/229
https://lkml.org/lkml/2012/6/17/231
^ 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