* linux-next: manual merge of the staging tree with Linus' tree
From: Stephen Rothwell @ 2012-04-27 4:37 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Jesper Juhl
[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/vt6656/ioctl.c between commit 17b7e1ba1e2e ("staging:
vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl
()") from Linus' tree and commit 62ef30b5781d ("staging: vt6656: Remove
redundant casts from ioctl.c") from the staging tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/vt6656/ioctl.c
index d59456c,cc7357d..0000000
--- a/drivers/staging/vt6656/ioctl.c
+++ b/drivers/staging/vt6656/ioctl.c
@@@ -565,7 -565,7 +565,7 @@@ int private_ioctl(PSDevice pDevice, str
result = -ENOMEM;
break;
}
- pNodeList = kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), (int)GFP_ATOMIC);
- pNodeList = (PSNodeList)kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), GFP_ATOMIC);
++ pNodeList = kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), GFP_ATOMIC);
if (pNodeList == NULL) {
result = -ENOMEM;
break;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the staging tree with the driver-core tree
From: Stephen Rothwell @ 2012-04-27 4:31 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Jonathan Cameron, MyungJoo Ham
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/Kconfig drivers/Makefile between commit de55d8716ac5 ("Extcon
(external connector): import Android's switch class and modify") from the
driver-core tree and commits a980e046098b ("IIO: Move the core files to
drivers/iio") and db3b9e990e75 ("Staging: VME: move VME drivers out of
staging") from the staging 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/Kconfig
index 0233ad9,e245779..0000000
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -140,6 -140,8 +140,10 @@@ source "drivers/virt/Kconfig
source "drivers/devfreq/Kconfig"
+source "drivers/extcon/Kconfig"
+
+ source "drivers/iio/Kconfig"
+
+ source "drivers/vme/Kconfig"
+
endmenu
diff --cc drivers/Makefile
index c41dfa9,08b78e0..0000000
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -134,4 -134,5 +134,6 @@@ obj-$(CONFIG_VIRT_DRIVERS) += virt
obj-$(CONFIG_HYPERV) += hv/
obj-$(CONFIG_PM_DEVFREQ) += devfreq/
+obj-$(CONFIG_EXTCON) += extcon/
+ obj-$(CONFIG_IIO) += iio/
+ obj-$(CONFIG_VME_BUS) += vme/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the usb tree
From: Stephen Rothwell @ 2012-04-27 4:12 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 548 bytes --]
Hi Greg,
After merging the usb tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
In file included from drivers/usb/host/ohci-hcd.c:1079:0:
drivers/usb/host/ohci-ps3.c: In function 'ps3_ohci_hc_start':
drivers/usb/host/ohci-ps3.c:48:3: error: implicit declaration of function 'err' [-Werror=implicit-function-declaration]
Caused by commit af4e1ee04026 ("USB: remove err() macro").
I have used the usb tree from next-20120424 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 tip tree with the security tree
From: Stephen Rothwell @ 2012-04-27 3:29 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, David Daney, Will Drewry, James Morris
[-- Attachment #1: Type: text/plain, Size: 950 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/Kconfig between commit c6cfbeb40296 ("x86: Enable
HAVE_ARCH_SECCOMP_FILTER") from the security tree and commit 8b5ad4729917
("Revert "x86, extable: Disable presorted exception table for now"") from
the tip 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/x86/Kconfig
index 3a41c44,83db6b9..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -82,10 -83,10 +83,11 @@@ config X8
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_IOMAP
select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
+ select HAVE_ARCH_SECCOMP_FILTER
+ select BUILDTIME_EXTABLE_SORT
config INSTRUCTION_DECODER
- def_bool (KPROBES || PERF_EVENTS)
+ def_bool (KPROBES || PERF_EVENTS || UPROBES)
config OUTPUT_FORMAT
string
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2012-04-27 2:02 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Jeff Kirsher, Bruce Allan
[-- Attachment #1: Type: text/plain, Size: 487 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/intel/e1000e/param.c between commit 727c356f4d79
("e1000e: Fix default interrupt throttle rate not set in NIC HW") from
the net tree and commit 6ad651456e3c ("e1000e: cleanup remaining strings
split across multiple lines") from the net-next tree.
The former included the change from the latter, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH] ARM:mfd: fix ezx-pcap build failure
From: Mark Brown @ 2012-04-26 22:04 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Mark Asselstine, Grant Likely, openezx-devel, linux-next, sameo,
linux-arm-kernel, haojian.zhuang
In-Reply-To: <20120426215258.GG24211@n2100.arm.linux.org.uk>
On Thu, Apr 26, 2012 at 10:52:58PM +0100, Russell King - ARM Linux wrote:
> The real answer is to fix SPI et.al. so that its possible to pass the
> _GPIO_ number into this driver (that's what the driver wants for its
> interrupt line after all). To fix that, SPI folk need to get involved
> (added Grant as a first step.)
Or, in the short term, add platform data to pass in a GPIO and ignore
any IRQ that might get passed in.
^ permalink raw reply
* Re: [PATCH] ARM:mfd: fix ezx-pcap build failure
From: Russell King - ARM Linux @ 2012-04-26 21:52 UTC (permalink / raw)
To: Mark Asselstine, Grant Likely
Cc: linux-next, openezx-devel, sameo, linux-arm-kernel,
haojian.zhuang
In-Reply-To: <1335366163-12920-1-git-send-email-mark.asselstine@windriver.com>
On Wed, Apr 25, 2012 at 11:02:43AM -0400, Mark Asselstine wrote:
> Attempting to build the ezx_defconfig we get a build failure:
>
> drivers/mfd/ezx-pcap.c: In function 'pcap_isr_work':
> drivers/mfd/ezx-pcap.c:205: error: implicit declaration of function 'irq_to_gpio'
>
> Looking at this failure we can find that commit 4929f5a8a99f
> [ARM:pxa: rename gpio_to_irq and irq_to_gpio] renamed irq_to_gpio()
> to pxa_irq_to_gpio() but this change was not made in the ezx-pcap
> driver.
That's because drivers shouldn't have knowledge about the SoC they're
running on. This driver is not restricted to only being built for PXA,
and so with your change, this will cause a link error should this be
built on non-PXA.
However, there's a big problem with code using irq_to_gpio() or any
variant of that in this manner:
} while (gpio_get_value(irq_to_gpio(pcap->spi->irq)));
What is the effect when the supplied IRQ does not have a mapping to a
GPIO - or it _does_ by way of a badly coded irq_to_gpio() function
but that GPIO is not the correct one.
There is no prevention against endlessly looping, so it could cause a
system lockup.
The real answer is to fix SPI et.al. so that its possible to pass the
_GPIO_ number into this driver (that's what the driver wants for its
interrupt line after all). To fix that, SPI folk need to get involved
(added Grant as a first step.)
In the meantime, I'd suggest making this depend on !ARM || BROKEN until
it's probably fixed.
>
> Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
> ---
> drivers/mfd/ezx-pcap.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
> index 43a76c4..c49c52a 100644
> --- a/drivers/mfd/ezx-pcap.c
> +++ b/drivers/mfd/ezx-pcap.c
> @@ -19,6 +19,7 @@
> #include <linux/spi/spi.h>
> #include <linux/gpio.h>
> #include <linux/slab.h>
> +#include <linux/gpio-pxa.h>
>
> #define PCAP_ADC_MAXQ 8
> struct pcap_adc_request {
> @@ -202,7 +203,7 @@ static void pcap_isr_work(struct work_struct *work)
> }
> local_irq_enable();
> ezx_pcap_write(pcap, PCAP_REG_MSR, pcap->msr);
> - } while (gpio_get_value(irq_to_gpio(pcap->spi->irq)));
> + } while (gpio_get_value(pxa_irq_to_gpio(pcap->spi->irq)));
> }
>
> static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)
> --
> 1.7.5.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: Update to SCSI trees for Linux Next
From: Dan Williams @ 2012-04-26 20:21 UTC (permalink / raw)
To: James Bottomley; +Cc: Stephen Rothwell, linux-next, linux-scsi
In-Reply-To: <1335177821.4191.17.camel@dabdike.lan>
On Mon, Apr 23, 2012 at 3:43 AM, James Bottomley
<James.Bottomley@hansenpartnership.com> wrote:
> Hi Stephen
>
> Just to let you know that SCSI is moving on to a single tree model from
> now on. The new tree is
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
>
> And the branch for next is for-next.
>
> Could you drop both the scsi-misc-2.6 and scsi-rc-fixes-2.6 tree, please
> because I'll send everything through this for-next branch.
>
> For the time being, could you keep the scsi-post-merge-2.6 tree? It's
> easier when resolving conflicts amongst other trees to use a separate
> git tree (although we haven't actually had to use this one for a while).
Speaking of resolving conflicts, are you looking to resolve conflicts
between scsi/fixes and development branches targeted at the next merge
window? Or, would you rather ask the development branch to rebase on
top of latest Linus once scsi/fixes lands upstream?
My libsas development branch, if I base it on current Linus, will
conflict with the bits queued in scsi/fixes.
--
Dan
^ permalink raw reply
* Re: linux-next: Tree for Apr 17 (pci-sysfs.c and vga_switcheroo.c)
From: Matthew Garrett @ 2012-04-25 16:45 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML, linux-pci,
dri-devel
In-Reply-To: <CAErSpo56ddRZCG=5yqcEUBPZ1_x76=33xkv5x-46gcNgQCA0Qg@mail.gmail.com>
On Wed, Apr 25, 2012 at 10:37:26AM -0600, Bjorn Helgaas wrote:
> I assume this is related to 77b267c7549e3629ea55cf780aa3d474da7bc2d5
> ("vgaarb: Add support for setting the default video device") and that
> Matthew will take care of whatever needs to be done (if it's not fixed
> already).
Dave has patches.
--
Matthew Garrett | mjg59@srcf.ucam.org
^ permalink raw reply
* Re: linux-next: Tree for Apr 17 (pci-sysfs.c and vga_switcheroo.c)
From: Bjorn Helgaas @ 2012-04-25 16:37 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, linux-pci, dri-devel,
Matthew Garrett
In-Reply-To: <4F8DB90A.8050504@xenotime.net>
On Tue, Apr 17, 2012 at 12:40 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> On 04/16/2012 09:42 PM, Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20120416:
>
>
> When CONFIG_VGA_ARB is not enabled:
>
> drivers/built-in.o: In function `boot_vga_show':
> pci-sysfs.c:(.text+0x1060f): undefined reference to `vga_default_device'
>
>
> and
>
> drivers/built-in.o: In function `boot_vga_show':
> pci-sysfs.c:(.text+0x8cc2): undefined reference to `vga_default_device'
> drivers/built-in.o: In function `vga_switcheroo_register_client':
> (.text+0x76671): undefined reference to `vga_default_device'
> drivers/built-in.o: In function `vga_switchto_stage1':
> vga_switcheroo.c:(.text+0x767f4): undefined reference to `vga_set_default_device'
I assume this is related to 77b267c7549e3629ea55cf780aa3d474da7bc2d5
("vgaarb: Add support for setting the default video device") and that
Matthew will take care of whatever needs to be done (if it's not fixed
already).
Bjorn
^ permalink raw reply
* Re: [PATCH -next] mtd: fix sbc2_flash build when PCI is not enabled
From: Artem Bityutskiy @ 2012-04-25 15:33 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Andrew Morton,
David Woodhouse, linux-mtd, Tim Hockin
In-Reply-To: <4F8C780D.9010702@xenotime.net>
[-- Attachment #1: Type: text/plain, Size: 665 bytes --]
On Mon, 2012-04-16 at 12:50 -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> sbc2_flash.c is a PCI driver, but its build fails when CONFIG_PCI
> is not enabled, so make it depend on PCI.
>
> drivers/mtd/maps/scb2_flash.c:237:1: warning: data definition has no type or storage class
> drivers/mtd/maps/scb2_flash.c:237:1: warning: type defaults to 'int' in declaration of 'module_pci_driver'
> drivers/mtd/maps/scb2_flash.c:237:1: warning: parameter names (without types) in function declaration
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Pushed to l2-mtd.git, thanks!
--
Best Regards,
Artem Bityutskiy
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* [PATCH] ARM:mfd: fix ezx-pcap build failure
From: Mark Asselstine @ 2012-04-25 15:02 UTC (permalink / raw)
To: linux-next
Cc: linux-arm-kernel, sameo, haojian.zhuang, openezx-devel,
mark.asselstine
Attempting to build the ezx_defconfig we get a build failure:
drivers/mfd/ezx-pcap.c: In function 'pcap_isr_work':
drivers/mfd/ezx-pcap.c:205: error: implicit declaration of function 'irq_to_gpio'
Looking at this failure we can find that commit 4929f5a8a99f
[ARM:pxa: rename gpio_to_irq and irq_to_gpio] renamed irq_to_gpio()
to pxa_irq_to_gpio() but this change was not made in the ezx-pcap
driver.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
drivers/mfd/ezx-pcap.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index 43a76c4..c49c52a 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -19,6 +19,7 @@
#include <linux/spi/spi.h>
#include <linux/gpio.h>
#include <linux/slab.h>
+#include <linux/gpio-pxa.h>
#define PCAP_ADC_MAXQ 8
struct pcap_adc_request {
@@ -202,7 +203,7 @@ static void pcap_isr_work(struct work_struct *work)
}
local_irq_enable();
ezx_pcap_write(pcap, PCAP_REG_MSR, pcap->msr);
- } while (gpio_get_value(irq_to_gpio(pcap->spi->irq)));
+ } while (gpio_get_value(pxa_irq_to_gpio(pcap->spi->irq)));
}
static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)
--
1.7.5.4
^ permalink raw reply related
* Re: [PATCH -next] mtd: fix sbc2_flash build when PCI is not enabled
From: Artem Bityutskiy @ 2012-04-25 11:05 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Andrew Morton,
David Woodhouse, linux-mtd, Tim Hockin
In-Reply-To: <4F8C780D.9010702@xenotime.net>
[-- Attachment #1: Type: text/plain, Size: 663 bytes --]
On Mon, 2012-04-16 at 12:50 -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> sbc2_flash.c is a PCI driver, but its build fails when CONFIG_PCI
> is not enabled, so make it depend on PCI.
>
> drivers/mtd/maps/scb2_flash.c:237:1: warning: data definition has no type or storage class
> drivers/mtd/maps/scb2_flash.c:237:1: warning: type defaults to 'int' in declaration of 'module_pci_driver'
> drivers/mtd/maps/scb2_flash.c:237:1: warning: parameter names (without types) in function declaration
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Pushed to l2-mtd.git, thanks!
--
Best Regards,
Artem Bityutskiy
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Apr 24 (kvm)
From: Avi Kivity @ 2012-04-25 9:35 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, kvm
In-Reply-To: <4F96D3FA.1010909@xenotime.net>
On 04/24/2012 07:25 PM, Randy Dunlap wrote:
> On 04/23/2012 10:43 PM, Stephen Rothwell wrote:
>
> > Hi all,
> >
> > There will probably be no linux-next release until April 30 as I am
> > taking a break.
> >
> > Changes since 20120423:
>
>
> on i386:
>
> CC [M] arch/x86/kvm/emulate.o
> arch/x86/kvm/emulate.c: Assembler messages:
> arch/x86/kvm/emulate.c:4122: Error: bad register name `%bpl'
>
>
Fix already committed, will be pushed later today.
--
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.
^ permalink raw reply
* Re: linux-next: clean up time
From: Stephen Rothwell @ 2012-04-25 0:00 UTC (permalink / raw)
To: Jeremy Fitzhardinge
Cc: linux-next, LKML, Ben Dooks, Xen Devel, Sumit Semwal, Rob Lee
In-Reply-To: <4F9722CA.80403@goop.org>
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
Hi Jeremy,
On Tue, 24 Apr 2012 15:01:46 -0700 Jeremy Fitzhardinge <jeremy@goop.org> wrote:
>
> Are you pulling from xen.git upstream/xen? I just updated it to be
> current Linus master, so it shouldn't conflict any more.
Yes, I fetch branch upstream/xen from
git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git and, yes, it
is empty now, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: New ARM build coverage (was: linux-next: triage for April 18, 2012)
From: Kukjin Kim @ 2012-04-24 23:50 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, Paul Gortmaker, linux-next, Kukjin Kim,
Ben Dooks
In-Reply-To: <201204201759.52271.arnd@arndb.de>
Arnd Bergmann wrote:
> On Thursday 19 April 2012, Paul Gortmaker wrote:
>> ARM folks,
>>
>> Just a heads up that Stephen expanded the linux-next ARM coverage
>> today to add a whole bunch more builds.
>>
>> Possibly "new" build fails were detected in these configs:
>>
>> ARM:mackerel_defconfig,ag5evm_defconfig
>> ARM:ezx_defconfig
>> ARM:mini2440_defconfig
>
> I think this is needed to fix mini2440_defconfig after the platform
> files have been moved around.
>
> Signed-off-by: Arnd Bergmann<arnd@arndb.de>
>
> diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig
> index 42da918..082175c 100644
> --- a/arch/arm/configs/mini2440_defconfig
> +++ b/arch/arm/configs/mini2440_defconfig
> @@ -14,6 +14,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y
> # CONFIG_BLK_DEV_BSG is not set
> CONFIG_BLK_DEV_INTEGRITY=y
> CONFIG_ARCH_S3C24XX=y
> +# CONFIG_CPU_S3C2410 is not set
> +CONFIG_CPU_S3C2440=y
> CONFIG_S3C_ADC=y
> CONFIG_S3C24XX_PWM=y
> CONFIG_MACH_MINI2440=y
I tested and it's ok to me.
Thanks, Will apply.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply
* Re: linux-next: clean up time
From: Jeremy Fitzhardinge @ 2012-04-24 22:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Ben Dooks, Xen Devel, Sumit Semwal, Rob Lee
In-Reply-To: <20120423164859.082b5c53b5d9bd9a524ec864@canb.auug.org.au>
On 04/22/2012 11:48 PM, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 2 Apr 2012 11:20:09 +1000 Stephen Rothwell
<sfr@canb.auug.org.au> wrote:
>>
>> Can people please clean up stuff in their trees that has been merged by
>> their upstream. This is especially useful where the upstream merged (or
>> applied) a slightly different version of their tree.
>
> There is still much cruft in the linux-next included trees ... The
> following trees appear empty (relative to Linus' tree) but cause conflicts:
>
> bjdooks-i2c
> xen
> dma-buf
> cpuidle-cons
Are you pulling from xen.git upstream/xen? I just updated it to be
current Linus master, so it shouldn't conflict any more.
Thanks,
J
^ permalink raw reply
* Re: linux-next: build warning in Linus' tree
From: Ted Ts'o @ 2012-04-24 17:09 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20120424112049.45955d7025fdfb3ce182ed2e@canb.auug.org.au>
On Tue, Apr 24, 2012 at 11:20:49AM +1000, Stephen Rothwell wrote:
>
> Using Linus' tree, today's linux-next build (powerpc ppc64_defconfig)
> produced this warning:
>
> fs/ext4/super.c: In function 'parse_options':
> fs/ext4/super.c:1600:23: warning: unused variable 'sbi' [-Wunused-variable]
>
> Introduced by commit 26092bf52478 ("ext4: use a table-driven handler for
> mount options"). This build has CONFIG_QUOTA not set.
This should be fixed in mainline now.
Regards,
- Ted
^ permalink raw reply
* Re: linux-next: Tree for Apr 24 (kvm)
From: Randy Dunlap @ 2012-04-24 16:25 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, kvm
In-Reply-To: <20120424154354.7feba600beac616833d034de@canb.auug.org.au>
On 04/23/2012 10:43 PM, Stephen Rothwell wrote:
> Hi all,
>
> There will probably be no linux-next release until April 30 as I am
> taking a break.
>
> Changes since 20120423:
on i386:
CC [M] arch/x86/kvm/emulate.o
arch/x86/kvm/emulate.c: Assembler messages:
arch/x86/kvm/emulate.c:4122: Error: bad register name `%bpl'
--
~Randy
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the driver-core tree
From: Greg KH @ 2012-04-24 14:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, MyungJoo Ham, Kyungmin Park,
John Stultz
In-Reply-To: <20120424144837.67a84b1e4e5905de7fd03e67@canb.auug.org.au>
On Tue, Apr 24, 2012 at 02:48:37PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in
> drivers/staging/android/Kconfig and drivers/staging/android/Makefile
> between commit 449a2bf5e881 ("Remove "switch" class in
> drivers/staging/android/switch") from the driver-core tree and commit
> ef2353d26bdc ("android-alarm: Remove unused android alarm in-kernel
> interfaces") from the staging tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks, that looks fine.
greg k-h
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the usb tree
From: Greg KH @ 2012-04-24 14:45 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20120424144820.326e86452826927b86aaf0f5@canb.auug.org.au>
On Tue, Apr 24, 2012 at 02:48:20PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/line6/driver.c between commit 2b8dec323d34 ("USB:
> driver.c: remove err() usage") from the usb tree and commit c46b8a6567fb
> ("Staging: line6: only allocate a buffer if it is needed") (and later)
> from the staging tree.
>
> The latter supercedes the former, so I used that.
Thanks, that is correct.
greg k-h
^ permalink raw reply
* linux-next: Tree for Apr 24
From: Stephen Rothwell @ 2012-04-24 5:43 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 29670 bytes --]
Hi all,
There will probably be no linux-next release until April 30 as I am
taking a break.
Changes since 20120423:
Removed trees:
scsi-rc-fixes (at maintainers request)
cpuidle-cons (done with)
The net-next tree gained a conflict against the infiniband tree.
The wireless-next tree gained a conflict against the net-next tree.
The drm tree still had its build failure so I used the version from
20120420.
The tty tree lost its conflict.
The staging tree lost a conflict but gained more against the usb and
driver-core trees.
----------------------------------------------------------------------------
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
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 187 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 (e895bd7 Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm)
Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
Merging kbuild-current/rc-fixes (e88aa7b Fix modpost failures in fedora 17)
Merging arm-current/fixes (3cd88f9 Revert "ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus")
Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices)
Merging powerpc-merge/merge (446f6d0 powerpc/mpic: Properly set default triggers)
Merging sparc/master (e9a5ea1 sparc32,leon: add notify_cpu_starting())
Merging net/master (d135c52 tcp: fix TCP_MAXSEG for established IPv6 passive sockets)
Merging sound-current/for-linus (cff7873 Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
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 (6ead629 brcmsmac: "INTERMEDIATE but not AMPDU" only when tracing)
Merging driver-core.current/driver-core-linus (e816b57 Linux 3.4-rc3)
Merging tty.current/tty-linus (66f75a5 Linux 3.4-rc4)
Merging usb.current/usb-linus (66f75a5 Linux 3.4-rc4)
Merging staging.current/staging-linus (e816b57 Linux 3.4-rc3)
Merging char-misc.current/char-misc-linus (e816b57 Linux 3.4-rc3)
Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes)
Merging input-current/for-linus (899c612 Input: synaptics - fix regression with "image sensor" trackpads)
Merging md-current/for-linus (afbaa90 md/bitmap: prevent bitmap_daemon_work running while initialising bitmap)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (511d63c crypto: talitos - properly lock access to global talitos registers)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (691c01c arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (766644d of/irq: add empty irq_of_parse_and_map() for non-dt builds)
Merging spi-current/spi/merge (39ec0d3 spi/imx: prevent NULL pointer dereference in spi_imx_probe())
Merging gpio-current/gpio/merge (9a5c7d6 gpio/exynos: Fix compiler warning in gpio-samsung.c file)
Merging arm/for-next (dc22814 Merge branches 'amba', 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (c16fa4f Linux 3.3)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (d0ee53a Merge branch 'next/board-samsung' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (35fe2e7 blackfin: update defconfig for bf527-ezkit)
Merging c6x/for-linux-next (c16fa4f Linux 3.3)
Merging cris/for-next (7b91747 cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile)
Merging hexagon/linux-next (4bd8193 various Kconfig cleanup and old platform build code removal)
Merging ia64/next (16f2634 [IA64] Normalize return value of chip->irq_set_affinity() method)
Merging m68k/for-next (dd70ca0 m68k/video: Create <asm/vga.h>)
Merging m68knommu/for-next (b97c0bb m68knommu: make sure 2nd FEC eth interface pins are enabled on 5275 ColdFire)
Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o)
Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next)
Merging openrisc/for-upstream (c88e692 asm-generic: add linux/types.h to cmpxchg.h)
Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next)
Merging powerpc/next (0195c00 Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system)
Merging 4xx/next (b5594a7 powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board)
Merging mpc5xxx/next (09f61ff 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 (1571bae [S390] crash dump: add missing SMP dependency)
Merging sh/sh-latest (b2212ea sh64: Kill off unused trap_no/error_code from thread_struct.)
Merging sparc-next/master (df2e7f5 sparc32: fix build of pcic)
CONFLICT (content): Merge conflict in arch/sparc/kernel/leon_smp.c
Merging tile/master (a46bf6d arch/tile: tilegx PCI root complex support)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (cd9d9f5 rbd: don't hold spinlock during messenger flush)
Merging cifs/master (3af9d8f cifs: fix offset handling in cifs_iovec_write)
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 (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
Merging ext3/for_next (77f0a97 jbd: Write journal superblock with WRITE_FUA after checkpointing)
Merging ext4/dev (57f73c2 ext4: fix handling of journalled quota options)
Merging fuse/for-next (c628ee6 fuse: use flexible array in fuse.h)
Merging gfs2/master (3c1d908 GFS2: Log code fixes)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (7bf97bc NFSv4: Keep dropped state owners on the LRU list for a while)
Merging nfsd/nfsd-next (f69adb2 nfsd: allocate id-to-name and name-to-id caches in per-net operations.)
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 (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux)
Merging ubifs/linux-next (297fe33 UBIFS: remove douple initialization in change_category())
Merging xfs/for-next (bc236c3 xfs: use shared ilock mode for direct IO writes by default)
Merging vfs/for-next (9448152 sch_atm.c: get rid of poinless extern)
Merging pci/next (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging hid/for-next (e3e49c3 Merge branch 'logitech' into for-next)
Merging quilt/i2c (85bb1a8 i2c-dev: Add support for I2C_M_RECV_LEN)
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 (565d04a i2c: muxes are not EXPERIMENTAL anymore)
Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (032c4871 acpi_power_meter: clean up code around setup_attrs)
Merging v4l-dvb/master (2a43f0b Merge /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in drivers/usb/gadget/uvc_queue.c
Merging kbuild/for-next (63ce2ed Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (85d6725 libata: make ata_print_id atomic)
Merging infiniband/for-next (c72adfd be2net: Add functionality to support RoCE driver)
Merging acpi/next (eeaab2d Merge branches 'idle-fix' and 'misc' into release)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (8527f8e firewire: core: fw_device_refresh(): clean up error handling)
Merging ubi/linux-next (0034102 Linux 3.4-rc2)
Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used)
Merging scsi/for-next (998e473 Merge branch 'misc' into for-next)
Merging target-updates/for-next (bfb79ea target/iscsi: Go back to core allocating data buffer for cmd)
Merging target-merge/for-next-merge (3e6e9e9 sbp-target: Initial merge of firewire/ieee-1394 target mode support)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (475448a merge: libsas devel rnc-devel fixes)
CONFLICT (content): Merge conflict in include/scsi/libsas.h
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_discover.c
Merging slave-dma/next (7e426da dma/ste_dma40: fix erroneous comparison)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (42f11cf be2net: fix ethtool get settings)
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be.h
Applying: net ax25: fix up sysctl change mismerge
Merging wireless-next/master (0586a11 rt2800: add chipset revision RT5390R support)
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-testmode.c
Merging bluetooth/master (8b9ff6e Bluetooth: Add support for reusing the same hci_conn for LE links)
Merging mtd/master (7b0e67f mtd: docg3 add protection against concurrency)
Merging l2-mtd/master (15ce11e mtd: omap2: fix resource leak in prefetch-busy path)
Merging crypto/master (d788fec crypto, xor: Sanitize checksumming function selection output)
Merging sound/for-next (e49e59a Merge branch 'for-linus' into for-next)
Merging sound-asoc/for-next (5cc757d Merge branch 'for-3.5' into asoc-next)
Merging cpufreq/next (a7b422c provide disable_cpufreq() function to disable the API.)
Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.)
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c
CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c
Merging input/next (5d06647 Input: use module_pci_driver)
Merging input-mt/for-next (0034102 Linux 3.4-rc2)
Merging cgroup/for-next (c4c27fb cgroups: disallow attaching kthreadd or PF_THREAD_BOUND threads)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging block/for-next (48eee61 Merge branch 'for-3.5/core' into for-next)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging quilt/device-mapper (025716f Fix a memory leak inadvertently introduced during simplification of cell_release_singleton() in commit 6f94a4c45a6f744383f9f695dde019998db3df55 ("dm thin: fix stacked bi_next usage").)
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 (48b332f mmc: omap_hsmmc: release correct resource)
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (9010dd6 MD RAID1: Further conditionalize 'fullsync')
Merging mfd/for-next (c00ba41 mfd: No need to check for the GPIO offset from asic3_gpio_to_irq)
CONFLICT (content): Merge conflict in drivers/mfd/asic3.c
Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling)
Merging drm/drm-next (b5daef9 drm: Unify and fix idr error handling)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_i2c.c
$ git reset --hard HEAD^
Merging refs/next/20120420/drm
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_i2c.c
[master 6c64ed3] Merge commit 'refs/next/20120420/drm'
Merging fbdev/fbdev-next (d313a86 i.MX28: Shut down the LCD controller to avoid BootROM sampling bug)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (df01d53 OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update)
Merging regulator/for-next (ac971f0 Merge branch 'regulator-drivers' into regulator-next)
Merging security/next (08162e6 Yama: remove an unused variable)
CONFLICT (content): Merge conflict in include/linux/filter.h
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 (8fb551c hpwdt: Only BYTE reads/writes to WD Timer port 0x72)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (7aff2d0 Merge branches 'iommu/fixes', 'dma-debug', 'arm/omap' and 'arm/tegra' into next)
Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (59bf896 Fix "the the" in various Kconfig)
CONFLICT (modify/delete): sound/soc/imx/Kconfig deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of sound/soc/imx/Kconfig left in tree.
$ git rm -f sound/soc/imx/Kconfig
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (66f75a5 Linux 3.4-rc4)
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 (a4b4be3 edac: rename channel_info to rank_info)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
Merging spi/spi/next (d57a428 spi/devicetree: Move devicetree support code into spi directory)
Merging tip/auto-latest (2adb096 Merge branch 'linus')
Merging rcu/rcu/next (a46771d Merge branches 'barrier.2012.04.19a', 'fixes.2012.04.18a' and 'inline.2012.04.18a' into dev.2012.04.19b)
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 (1f15d10 KVM: add kvm_arch_para_features stub to asm-generic/kvm_para.h)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging kvm-ppc/kvm-ppc-next (428d50e KVM: PPC: Use clockevent multiplier and shifter for decrementer)
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
Merging xen-two/linux-next (e300b82 Merge branch 'stable/for-linus-3.4' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (adb7950 percpu: fix __this_cpu_{sub,inc,dec}_return() definition)
Merging workqueues/for-next (0976dfc workqueue: Catch more locking problems with flush_work())
Merging drivers-x86/linux-next (e64c9de dell-laptop: Terminate quirks list properly)
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 (b076764 Merge branch 'regmap-stride' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (6b96061 lib/kobject.c : Remove redundant check in create_dir)
Merging tty/tty-next (10af77c Merge 3.4-rc4 into tty-next)
Merging usb/usb-next (ec42899 USB: wwan: remove an unneeded check)
Merging staging/staging-next (e0ebe94 Staging: media: lirc: lirc_imon: remove err() usage)
CONFLICT (content): Merge conflict in drivers/staging/line6/driver.c
CONFLICT (content): Merge conflict in drivers/staging/android/Makefile
CONFLICT (content): Merge conflict in drivers/staging/android/Kconfig
Merging char-misc/char-misc-next (9912143 parport: remove unused dead code from lowlevel drivers)
Merging tmem/linux-next (0f1ea93 Merge branch 'stable/frontswap.v14' into linux-next)
Merging writeback/writeback-for-next (697e6fe writeback: Remove outdated comment)
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 (dcb5dbc pinctrl: show pin name for pingroups in sysfs)
CONFLICT (content): Merge conflict in drivers/pinctrl/core.c
CONFLICT (content): Merge conflict in Documentation/driver-model/devres.txt
Merging tegra/for-next (9fbe795 Merge branch 'for-3.5/defconfig' into for-next)
Merging moduleh/for-sfr (3c5c69b blackfin: fix ifdef fustercluck in mach-bf538/boards/ezkit.c)
Merging vhost/linux-next (33b3aa0 x86: eoi micro-optimization)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
CONFLICT (content): Merge conflict in drivers/Kconfig
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/)
Merging irqdomain/irqdomain/next (e7cc3ac dt: fix twl4030 for non-dt compile on x86)
Merging gpio/gpio/next (f141ed6 gpio: Move DT support code into drivers/gpio)
Merging arm-soc/for-next (3798df5 update contents file)
CONFLICT (content): Merge conflict in arch/arm/mach-lpc32xx/common.c
Merging kvmtool/master (0333eec kvm tools: Update README for CONFIG_FB_VESA)
Merging dma-mapping/dma-mapping-next (c6b1f07 ARM: integrate CMA with DMA-mapping subsystem)
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
Merging dma-buf/for-next (9f28056 dma-buf: Correct dummy function declarations.)
CONFLICT (content): Merge conflict in include/linux/dma-buf.h
CONFLICT (content): Merge conflict in drivers/base/dma-buf.c
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: umem: fix up unplugging
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
Applying: arch/x86/include/asm/spinlock.h: fix comment
Applying: arch/x86/kernel/apic/io_apic.c: move io_apic_level_ack_pending() inside CONFIG_GENERIC_PENDING_IRQ
Applying: drivers/xen/Kconfig: fix Kconfig layout
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: avr32: don't mask signals in the error path
Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
Applying: avr32: use block_sigmask()
Applying: m32r: use set_current_blocked() and block_sigmask()
Applying: m68k: use set_current_blocked() and block_sigmask()
Applying: mn10300: use set_current_blocked() and block_sigmask()
Applying: cpuidle: remove unused hrtimer_peek_ahead_timers() call
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: cris: select GENERIC_ATOMIC64
Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix
Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
Applying: net: use this_cpu_xxx replace percpu_xxx funcs
Applying: percpu: remove percpu_xxx() functions
Applying: percpu-remove-percpu_xxx-functions-fix
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: ia64: use set_current_blocked() and block_sigmask()
Applying: microblaze: don't reimplement force_sigsegv()
Applying: microblaze: no need to reset handler if SA_ONESHOT
Applying: microblaze: fix signal masking
Applying: microblaze: use set_current_blocked() and block_sigmask()
Applying: MIPS: use set_current_blocked() and block_sigmask()
Applying: score: don't mask signals if we fail to setup signal stack
Applying: score: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: unicore32: use block_sigmask()
Applying: blackfin: use set_current_blocked() and block_sigmask()
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: drivers/scsi/ufs: use module_pci_driver
Applying: vfs: increment iversion when a file is truncated
Applying: fs: symlink restrictions on sticky directories
Applying: fs: hardlink creation restrictions
Applying: fsnotify: remove unused parameter from send_to_group()
Applying: fsnotify: handle subfiles' perm events
Applying: brlocks/lglocks: cleanups
Applying: mm/memory_failure: let the compiler add the function name
Applying: mm/mempolicy.c: use enum value MPOL_REBIND_ONCE in mpol_rebind_policy()
Applying: mm/hugetlb.c: use long vars instead of int in region_count()
Applying: mm, thp: remove unnecessary ret variable
Applying: mm, thp: allow fallback when pte_alloc_one() fails for huge pmd
Applying: mm: vmscan: remove lumpy reclaim
Applying: mm: vmscan: remove reclaim_mode_t
Applying: mm: remove swap token code
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: memcg: fix/change behavior of shared anon at moving task
Applying: memcg swap: mem_cgroup_move_swap_account never needs fixup
Applying: memcg swap: use mem_cgroup_uncharge_swap()
Applying: mm/memcg: scanning_global_lru means mem_cgroup_disabled
Applying: mm/memcg: move reclaim_stat into lruvec
Applying: mm: push lru index into shrink_[in]active_list()
Applying: mm-push-lru-index-into-shrink_active_list-fix
Applying: mm: mark mm-inline functions as __always_inline
Applying: mm: remove lru type checks from __isolate_lru_page()
Applying: mm/memcg: kill mem_cgroup_lru_del()
Applying: memcg: mark more functions/variables as static
Applying: memcg: remove unused variable
Applying: memcg: mark stat field of mem_cgroup struct as __percpu
Applying: memcg: remove redundant parentheses
Applying: memcg: make threshold index in the right position
Applying: memcg: revise the position of threshold index while unregistering event
Applying: mm/memcg: use vm_swappiness from target memory cgroup
Applying: security/keys/keyctl.c: suppress memory allocation failure warning
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
Applying: sgi-xp: use lockdep_assert_held()
Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked()
Applying: XFS: fix lock ASSERT on UP
Applying: mm/huge_memory.c: use lockdep_assert_held()
Applying: futex: use lockdep_assert_held() for lock checking
Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked()
Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct
Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad
Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix
Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use
Applying: checkpatch: check for spin_is_locked()
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: vsprintf: further optimize decimal conversion
Applying: vsprintf-further-optimize-decimal-conversion-v2
Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes
Applying: hamradio/scc: orphan driver in MAINTAINERS
Applying: MAINTAINERS: remove Alessandro
Applying: blacklight: remove redundant spi driver bus initialization
Applying: drivers/leds/leds-lp5521.c: fix lp5521_read() error handling
Applying: leds: driver for DA9052/53 PMIC v2
Applying: leds-led-module-for-da9052-53-pmic-v2-fix
Applying: leds: add LED driver for lm3556 chip
Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes
Applying: leds: simple_strtoul() cleanup
Applying: list_debug: WARN for adding something already in the list
Applying: lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata
Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
Applying: rtc/spear: add Device Tree probing capability
Applying: drivers/rtc/rtc-ep93xx.c: convert to use module_platform_driver()
Applying: rtc: add ioctl to get/clear battery low voltage status
Applying: drivers/rtc/rtc-pcf8563.c: add RTC_VL_READ/RTC_VL_CLR ioctl feature
Applying: drivers/rtc/Kconfig: place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
Applying: rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
Applying: rtc-rename-config_rtc_mxc-to-config_rtc_drv_mxc-fix
Applying: HPFS: remove PRINTK() macro
Applying: kmod: unexport call_usermodehelper_freeinfo()
Applying: kmod: convert two call sites to call_usermodehelper_fns()
Applying: kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
Applying: kmod: avoid deadlock from recursive kmod call
Applying: proc: clean up /proc/<pid>/environ handling
Applying: proc-clean-up-proc-pid-environ-handling-checkpatch-fixes
Applying: proc: unify ptrace_may_access() locking code
Applying: proc: remove mm_for_maps()
Applying: proc: use mm_access() instead of ptrace_may_access()
Applying: proc: use IS_ERR_OR_NULL()
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: rapidio: add DMA engine support for RIO data transfers
Applying: rapidio/tsi721: add DMA engine support
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8 comment update
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-comment-update-fix
Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
Applying: c/r: prctl: add ability to set new mm_struct::exe_file
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: c/r: ipc: message queue receive cleanup
Applying: c/r: ipc: message queue stealing feature introduced
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: notify_change(): check that i_mutex is held
Merging akpm (f273c53 notify_change(): check that i_mutex is held)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* RE: linux-next: manual merge of the wireless-next tree with the net-next tree
From: Grumbach, Emmanuel @ 2012-04-24 5:07 UTC (permalink / raw)
To: Stephen Rothwell, John W. Linville
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Guy, Wey-Yi W, David Miller, netdev@vger.kernel.org
In-Reply-To: <20120424124803.f4dc75ea96a875c3f35db615@canb.auug.org.au>
>
> Hi John,
>
> Today's linux-next merge of the wireless-next tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-testmode.c between commit d33e152e1edd
> ("iwlwifi: Stop using NLA_PUT*()") from the net-next tree and commit
> 2152268ff911 ("iwlwifi: op_mode holds its pointer to the config") from the
> wireless-next tree.
>
> I was hoping that we were done with these ... :-(
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks Stephen, your fix seems right. In this case, there are only two choices: it is right or it doesn't even compile.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/net/wireless/iwlwifi/iwl-testmode.c
> index bb27509,a6b16aa..0000000
> --- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
> @@@ -543,12 -539,11 +543,12 @@@ static int iwl_testmode_driver(struct i
> IWL_ERR(priv, "Memory allocation fail\n");
> return -ENOMEM;
> }
> - NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND,
> - IWL_TM_CMD_DEV2APP_EEPROM_RSP);
> - NLA_PUT(skb, IWL_TM_ATTR_EEPROM,
> - priv->cfg->base_params->eeprom_size,
> - priv->eeprom);
> + if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
> + IWL_TM_CMD_DEV2APP_EEPROM_RSP) ||
> + nla_put(skb, IWL_TM_ATTR_EEPROM,
> - cfg(priv)->base_params->eeprom_size,
> ++ priv->cfg->base_params->eeprom_size,
> + priv->eeprom))
> + goto nla_put_failure;
> status = cfg80211_testmode_reply(skb);
> if (status < 0)
> IWL_ERR(priv, "Error sending msg : %d\n",
---------------------------------------------------------------------
Intel Israel (74) Limited
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
^ permalink raw reply
* linux-next: manual merge of the staging tree with the driver-core tree
From: Stephen Rothwell @ 2012-04-24 4:48 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, MyungJoo Ham, Kyungmin Park,
John Stultz
[-- Attachment #1: Type: text/plain, Size: 1555 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got conflicts in
drivers/staging/android/Kconfig and drivers/staging/android/Makefile
between commit 449a2bf5e881 ("Remove "switch" class in
drivers/staging/android/switch") from the driver-core tree and commit
ef2353d26bdc ("android-alarm: Remove unused android alarm in-kernel
interfaces") from the staging 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/staging/android/Kconfig
index c706635,84ac619..0000000
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@@ -53,7 -52,9 +53,7 @@@ config ANDROID_LOW_MEMORY_KILLE
---help---
Register processes to be killed when memory is low
- config ANDROID_INTF_ALARM
-source "drivers/staging/android/switch/Kconfig"
-
+ config ANDROID_INTF_ALARM_DEV
bool "Android alarm driver"
depends on RTC_CLASS
default n
diff --cc drivers/staging/android/Makefile
index 045d17b,b4be69f..0000000
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@@ -6,5 -6,5 +6,4 @@@ obj-$(CONFIG_ANDROID_RAM_CONSOLE) += ra
obj-$(CONFIG_ANDROID_TIMED_OUTPUT) += timed_output.o
obj-$(CONFIG_ANDROID_TIMED_GPIO) += timed_gpio.o
obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER) += lowmemorykiller.o
- obj-$(CONFIG_ANDROID_INTF_ALARM) += alarm.o
-obj-$(CONFIG_ANDROID_SWITCH) += switch/
obj-$(CONFIG_ANDROID_INTF_ALARM_DEV) += alarm-dev.o
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the staging tree with the usb tree
From: Stephen Rothwell @ 2012-04-24 4:48 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/line6/driver.c between commit 2b8dec323d34 ("USB:
driver.c: remove err() usage") from the usb tree and commit c46b8a6567fb
("Staging: line6: only allocate a buffer if it is needed") (and later)
from the staging tree.
The latter supercedes the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ 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