* Re: new location of the bluetooth tree
From: Stephen Rothwell @ 2012-03-27 23:24 UTC (permalink / raw)
To: Gustavo Padovan
Cc: linux-next, Marcel Holtmann, Johan Hedberg, davem, linville
In-Reply-To: <20120327171222.GG9856@joana>
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
Hi Gustavo,
On Tue, 27 Mar 2012 14:12:22 -0300 Gustavo Padovan <gustavo@padovan.org> wrote:
>
> We have just updated the address of the bluetooth-next tree, we now have a
> shared tree where all maintainers can commit to. The new address is:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
>
> The old tree will be deleted and is not valid anymore.
I have changed to using the new tree (I assume I should still fetch the
master branch).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the scsi tree
From: Alexey Dobriyan @ 2012-03-27 22:39 UTC (permalink / raw)
To: Greg KH; +Cc: James Bottomley, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20120327223510.GB3233@p183.telecom.by>
On Wed, Mar 28, 2012 at 01:35:10AM +0300, Alexey Dobriyan wrote:
> On Tue, Mar 27, 2012 at 03:22:16PM -0700, Greg KH wrote:
> > > The amount of code once removed from staging prevented me from doing
> > > any work on them.
> > >
> > > Looking at staging ->read_proc users this is going to be a problem for
> > > its removal. :-(
> >
> > Why?
>
> Because if staging does count, I can't remove the interface
> without breaking allmodconfig and it would take forever to convert
> staging stuff. I don't have energy to do it anymore.
> Mainline still have several _hard_ ->read_proc conversions.
> I've tried several times and failed.
>
> If staging doesn't count, I will break allmodconfig and all those nasty
> emails will show up anyway implying that staging does count.
It's comparable to what mainline has besides staging.
I'm talking about this.
$ grep -e read_proc -w -n -r drivers/staging/
drivers/staging/comedi/proc.c:92: comedi_proc->read_proc = comedi_read;
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c:298: e->read_proc = show_debug_level;
drivers/staging/serial/68360serial.c:2428: /* .read_proc = rs_360_read_proc, */
drivers/staging/rtl8192e/rtllib_module.c:262: e->read_proc = show_debug_level;
$ grep -e create_proc_read_entry -w -n -r drivers/staging/
drivers/staging/telephony/ixj.c:7763: create_proc_read_entry ("ixj", 0, NULL, ixj_read_proc, NULL);
drivers/staging/ft1000/ft1000-usb/ft1000_proc.c:189: ft1000_proc_file = create_proc_read_entry(dev->name, 0644,
drivers/staging/ft1000/ft1000-usb/ft1000_proc.c:221: create_proc_read_entry(dev->name, 0644,
drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c:181: create_proc_read_entry(dev->name, 0644, info->proc_ft1000,
drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c:200: create_proc_read_entry(dev->name, 0644, info->proc_ft1000,
drivers/staging/rtl8192u/r8192U_core.c:714: e = create_proc_read_entry("stats-rx", S_IFREG | S_IRUGO,
drivers/staging/rtl8192u/r8192U_core.c:724: e = create_proc_read_entry("stats-tx", S_IFREG | S_IRUGO,
drivers/staging/rtl8192u/r8192U_core.c:733: e = create_proc_read_entry("stats-ap", S_IFREG | S_IRUGO,
drivers/staging/rtl8192u/r8192U_core.c:742: e = create_proc_read_entry("registers", S_IFREG | S_IRUGO,
drivers/staging/cxt1e1/sbeproc.c:325: e = create_proc_read_entry ("info", S_IFREG | S_IRUGO,
drivers/staging/rtl8187se/r8180_core.c:343: e = create_proc_read_entry("stats-hw", S_IFREG | S_IRUGO,
drivers/staging/rtl8187se/r8180_core.c:351: e = create_proc_read_entry("stats-rx", S_IFREG | S_IRUGO,
drivers/staging/rtl8187se/r8180_core.c:360: e = create_proc_read_entry("stats-tx", S_IFREG | S_IRUGO,
drivers/staging/rtl8187se/r8180_core.c:368: e = create_proc_read_entry("registers", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:873: e = create_proc_read_entry("stats-rx", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:881: e = create_proc_read_entry("stats-tx", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:889: e = create_proc_read_entry("stats-ap", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:897: e = create_proc_read_entry("registers-0", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:903: e = create_proc_read_entry("registers-1", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:909: e = create_proc_read_entry("registers-2", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:915: e = create_proc_read_entry("registers-3", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:921: e = create_proc_read_entry("registers-4", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:927: e = create_proc_read_entry("registers-5", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:933: e = create_proc_read_entry("registers-6", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:939: e = create_proc_read_entry("registers-7", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:945: e = create_proc_read_entry("registers-8", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:951: e = create_proc_read_entry("registers-9", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:957: e = create_proc_read_entry("registers-a", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:963: e = create_proc_read_entry("registers-b", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:969: e = create_proc_read_entry("registers-c", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:975: e = create_proc_read_entry("registers-d", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:981: e = create_proc_read_entry("registers-e", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:987: e = create_proc_read_entry("RF-A", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:993: e = create_proc_read_entry("RF-B", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:999: e = create_proc_read_entry("RF-C", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:1005: e = create_proc_read_entry("RF-D", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:1011: e = create_proc_read_entry("SEC-CAM-1", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:1017: e = create_proc_read_entry("SEC-CAM-2", S_IFREG | S_IRUGO,
drivers/staging/rtl8192e/rtl8192e/rtl_debug.c:1023: e = create_proc_read_entry("SEC-CAM-3", S_IFREG | S_IRUGO,
drivers/staging/wlags49_h2/wl_main.c:912: create_proc_read_entry( "wlags", 0, NULL, scull_read_procmem, dev );
^ permalink raw reply
* Re: linux-next: build failure after merge of the scsi tree
From: Alexey Dobriyan @ 2012-03-27 22:35 UTC (permalink / raw)
To: Greg KH; +Cc: James Bottomley, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20120327222216.GB469@kroah.com>
On Tue, Mar 27, 2012 at 03:22:16PM -0700, Greg KH wrote:
> On Wed, Mar 28, 2012 at 01:17:21AM +0300, Alexey Dobriyan wrote:
> > On Mon, Mar 26, 2012 at 07:07:21AM -0700, Greg KH wrote:
> > > On Mon, Mar 26, 2012 at 08:57:21AM +0100, James Bottomley wrote:
> > > > On Mon, 2012-03-26 at 12:17 +1100, Stephen Rothwell wrote:
> > > > > Hi James,
> > > > >
> > > > > After merging the scsi tree, today's linux-next build (x86_64 allmodconfig)
> > > > > failed like this:
> > > > >
> > > > > drivers/staging/keucr/scsiglue.c:349:2: error: unknown field 'proc_info' specified in initializer
> > > > > drivers/staging/rts_pstor/rtsx.c:258:2: error: unknown field 'proc_info' specified in initializer
> > > > > drivers/staging/rts5139/rts51x_scsi.c:2190:2: error: unknown field 'proc_info' specified in initializer
> > > > >
> > > > > Caused by commit 104c4fe25dc9 ("[SCSI] remove scsi_host_template::proc_info").
> > > > >
> > > > > Since this is a staging driver, I applied these following patches:
> > > >
> > > > Yes, that looks about right, thanks. We haven't seen anything about
> > > > these drivers on the SCSI list, so I've no idea where they are in
> > > > development.
> > >
> > > Why is new patches going into your tree right now, during the 3.4 merge
> > > window? API changes should have happened weeks ago, to let others fix
> > > up things like this.
> > >
> > > As for the "where they are in development", they vary, but, a simple
> > > grep should have shown you that these in-kernel drivers should also be
> > > fixed up, or at the least, give me the heads up to let me do it for you.
> > >
> > > Care to send me the patch that causes this problem so I can create a fix
> > > for this?
> >
> > See commits 422f07001d6638fdde28f1909cc9162bc7f571d3..104c4fe25dc9bde823ba4591e910a77071b98ab5
> > Especially the first one.
> >
> > Probably the best course of action is to remove proc_info code from
> > these drivers because the interface was deprecated for a long time.
>
> If the interface is depreciated, yes, I can remove it now, just let me
> know and I will do so.
>
> > The amount of code once removed from staging prevented me from doing
> > any work on them.
> >
> > Looking at staging ->read_proc users this is going to be a problem for
> > its removal. :-(
>
> Why?
Because if staging does count, I can't remove the interface
without breaking allmodconfig and it would take forever to convert
staging stuff. I don't have energy to do it anymore.
Mainline still have several _hard_ ->read_proc conversions.
I've tried several times and failed.
If staging doesn't count, I will break allmodconfig and all those nasty
emails will show up anyway implying that staging does count.
^ permalink raw reply
* Re: linux-next: build failure after merge of the scsi tree
From: Greg KH @ 2012-03-27 22:22 UTC (permalink / raw)
To: Alexey Dobriyan
Cc: James Bottomley, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20120327221721.GA3233@p183.telecom.by>
On Wed, Mar 28, 2012 at 01:17:21AM +0300, Alexey Dobriyan wrote:
> On Mon, Mar 26, 2012 at 07:07:21AM -0700, Greg KH wrote:
> > On Mon, Mar 26, 2012 at 08:57:21AM +0100, James Bottomley wrote:
> > > On Mon, 2012-03-26 at 12:17 +1100, Stephen Rothwell wrote:
> > > > Hi James,
> > > >
> > > > After merging the scsi tree, today's linux-next build (x86_64 allmodconfig)
> > > > failed like this:
> > > >
> > > > drivers/staging/keucr/scsiglue.c:349:2: error: unknown field 'proc_info' specified in initializer
> > > > drivers/staging/rts_pstor/rtsx.c:258:2: error: unknown field 'proc_info' specified in initializer
> > > > drivers/staging/rts5139/rts51x_scsi.c:2190:2: error: unknown field 'proc_info' specified in initializer
> > > >
> > > > Caused by commit 104c4fe25dc9 ("[SCSI] remove scsi_host_template::proc_info").
> > > >
> > > > Since this is a staging driver, I applied these following patches:
> > >
> > > Yes, that looks about right, thanks. We haven't seen anything about
> > > these drivers on the SCSI list, so I've no idea where they are in
> > > development.
> >
> > Why is new patches going into your tree right now, during the 3.4 merge
> > window? API changes should have happened weeks ago, to let others fix
> > up things like this.
> >
> > As for the "where they are in development", they vary, but, a simple
> > grep should have shown you that these in-kernel drivers should also be
> > fixed up, or at the least, give me the heads up to let me do it for you.
> >
> > Care to send me the patch that causes this problem so I can create a fix
> > for this?
>
> See commits 422f07001d6638fdde28f1909cc9162bc7f571d3..104c4fe25dc9bde823ba4591e910a77071b98ab5
> Especially the first one.
>
> Probably the best course of action is to remove proc_info code from
> these drivers because the interface was deprecated for a long time.
If the interface is depreciated, yes, I can remove it now, just let me
know and I will do so.
> The amount of code once removed from staging prevented me from doing
> any work on them.
>
> Looking at staging ->read_proc users this is going to be a problem for
> its removal. :-(
Why?
^ permalink raw reply
* Re: linux-next: build failure after merge of the scsi tree
From: Alexey Dobriyan @ 2012-03-27 22:17 UTC (permalink / raw)
To: Greg KH; +Cc: James Bottomley, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20120326140721.GA19827@kroah.com>
On Mon, Mar 26, 2012 at 07:07:21AM -0700, Greg KH wrote:
> On Mon, Mar 26, 2012 at 08:57:21AM +0100, James Bottomley wrote:
> > On Mon, 2012-03-26 at 12:17 +1100, Stephen Rothwell wrote:
> > > Hi James,
> > >
> > > After merging the scsi tree, today's linux-next build (x86_64 allmodconfig)
> > > failed like this:
> > >
> > > drivers/staging/keucr/scsiglue.c:349:2: error: unknown field 'proc_info' specified in initializer
> > > drivers/staging/rts_pstor/rtsx.c:258:2: error: unknown field 'proc_info' specified in initializer
> > > drivers/staging/rts5139/rts51x_scsi.c:2190:2: error: unknown field 'proc_info' specified in initializer
> > >
> > > Caused by commit 104c4fe25dc9 ("[SCSI] remove scsi_host_template::proc_info").
> > >
> > > Since this is a staging driver, I applied these following patches:
> >
> > Yes, that looks about right, thanks. We haven't seen anything about
> > these drivers on the SCSI list, so I've no idea where they are in
> > development.
>
> Why is new patches going into your tree right now, during the 3.4 merge
> window? API changes should have happened weeks ago, to let others fix
> up things like this.
>
> As for the "where they are in development", they vary, but, a simple
> grep should have shown you that these in-kernel drivers should also be
> fixed up, or at the least, give me the heads up to let me do it for you.
>
> Care to send me the patch that causes this problem so I can create a fix
> for this?
See commits 422f07001d6638fdde28f1909cc9162bc7f571d3..104c4fe25dc9bde823ba4591e910a77071b98ab5
Especially the first one.
Probably the best course of action is to remove proc_info code from
these drivers because the interface was deprecated for a long time.
The amount of code once removed from staging prevented me from doing
any work on them.
Looking at staging ->read_proc users this is going to be a problem for
its removal. :-(
^ permalink raw reply
* linux-next: triage for March 27, 2012
From: Paul Gortmaker @ 2012-03-27 21:36 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
New breakage since last report:
<none>
Randconfig fails that may or may not be new (by their very nature):
x86_64: No rule to make scsi/aic7xxx/aicasm/*.[chyl]
(http://kisskb.ellerman.id.au/kisskb/buildresult/5981187/)
Builds that are fixed since last report:
ARM:u300_defconfig
tilegx:defconfig
The blackfin builds are no longer failing on vm_is_stack but instead
are all failing with "L1 data A overflow!" at final link, which smells
like some kind of binutils/toolchain issue.
The following have fixes posted for quite some time now, but the fixes
haven't yet been integrated. Please have a look at these, as it would
be nice to have them in tree before wk2 of the merge window closes.
ARM:magician_defconfig
ARM:collie_defconfig
ARM:iop32x_defconfig,iop33x_defconfig
ARM:em_x270_defconfig
AVR32:defconfig
Note: The randconfig fails are only listed once and not tracked
in the below listing.
------------------------------------------------
Latest results at:
http://kisskb.ellerman.id.au/kisskb/branch/9/
Failures as of March 27th, 2012:
================================
AM33:asb2303_defconfig,asb2364_defconfig
when: Mar 15
why: cc1: error: unrecognized command line option '-mmem-funcs'
status: Possible fix from TonyB sent for review.
fix: http://marc.info/?l=linux-kernel&m=133185020313818&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5878400/
----------------
ARM:omap2plus_defconfig
when: Mar 26
why: board-omap4panda.c: 'btwilink_device' undeclared
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5968352/
ARM:rpc_defconfig
when: Mar 26
why: scsi/arm/powertec.c: implicit declaration 'seq_printf'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5967948/
ARM:cm_x2xx_defconfig
when: Mar 19
why: it8152.c: redefinition of 'dma_set_coherent_mask'
status: bisected and reported (PaulG)
fix:
ref: http://marc.info/?l=linux-next&m=133226851818586&w=2
ARM:netx_defconfig,pnx4008_defconfig
when: Mar 14
why: net/core/pktgen.c: can't find a register in class 'GENERAL_REGS'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5869486/
ref: https://lkml.org/lkml/2012/3/13/670
ARM:collie_defconfig
when: Feb 14
why: locomolcd.c: error: 'sa1100fb_lcd_power' undeclared
status: fixed (PaulG) - pending integration
fix: http://marc.info/?l=linux-next&m=133105157730749&w=2
ref:
ARM:iop32x_defconfig,iop33x_defconfig
when: Nov 23
why: restart.c: implicit declaration of function 'soft_restart'
status: fixed (PaulG) - pending integration
fix: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-January/081461.html
fix: https://lkml.org/lkml/2012/3/14/253
ref:
ARM:ixp4xx_defconfig
when: Oct 26
why: gpio.h: implicit declaration of function '__gpio_get_value'
status: fixed (Imre Kaloz) - but possibly needs rework?
fix: https://lkml.org/lkml/2012/2/8/288
ref: https://lkml.org/lkml/2012/2/8/287
ARM:magician_defconfig
when: Feb 13
why: magician.c: unknown field 'dev' specified in initializer
status: fixed (PaulG) - pending integration
fix: http://marc.info/?l=linux-arm-kernel&m=133124258707457&w=2
ref: http://marc.info/?l=linux-next&m=133106325903524&w=2
ARM:em_x270_defconfig
when: Feb 14
why: em-x270.c: unknown field 'dev' specified in initializer
status: fixed (PaulG) - pending integration
fix: http://www.spinics.net/lists/arm-kernel/msg164012.html
ref: http://www.spinics.net/lists/arm-kernel/msg163135.html
ARM:raumfeld_defconfig
when: Nov 23
why: eeti_ts.c: implicit declaration of function 'irq_to_gpio'
status: perhaps broken since 2010? See ref below.
fix:
ref: http://www.gossamer-threads.com/lists/linux/kernel/1291618?do=post_view_threaded#1291618
ARM:arm-allnoconfig
when: forever
why: not supported
status: nothing pending, but patches accepted
fix: n/a
ref: https://lkml.org/lkml/2009/4/30/105
ref: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-January/081218.html
----------------
AVR32:defconfig
when: Mar 18
why: board.h: atmel_nand.h: No such file or directory
status: reported/fixed (PaulG)
fix: http://marc.info/?l=linux-arm-kernel&m=133239363802517&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5917107/
AVR32:allnoconfig
when: May 26 2010, 20:49
why: at32_map_usart: undefined reference to `atmel_default_console_device'
status:
fix:
ref:
---------------
bfin:***all-builds***
when: Mar 26
why: bfin-uclinux-ld: L1 data A overflow!
status: unknown, binutils issue?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5981475/
---------------
cris:***all-builds***
when: Mar 25, 22:05
why: include/linux/types.h:25: error expected ... before 'ino_t'
status:
fix:
ref:
----------------
crisv32:***all-builds***
when: Mar 25, 22:05
why: include/linux/types.h:25: error expected ... before 'ino_t'
status:
fix:
ref:
----------------
frv:defconfig
when: Mar 15
why: arch/frv/kernel/head.S operand out of range
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884666/
----------------
h8300:defconfig
when: Mar 15
why: time.c: implicit declaration of function 'get_irq_regs'
why: also seems gcc suffers an ICE
status: ICE bug lodged with gcc folks (TonyB)
fix:
ref: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52598
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884668/
----------------
ia64:defconfig
when: Mar 26
why: asm-offsets.c:322: unterminated arg list invoking macro "DEFINE"
status: trivial typo, missing ")"
fix:
ref: https://lkml.org/lkml/2012/3/26/496
----------------
i386:allmodconfig
when: Mar 8, 20:41
why: ERROR: "mdfld_set_brightness" [drivers/gpu/drm/gma500/gma500_gfx.ko] undefined!
status:
fix:
ref: https://lkml.org/lkml/2012/3/24/122
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5878506/
----------------
m32r:m32700ut.smp_defconfig
when: Mar 15
why: No rule to make target `arch/m32r/boot/compressed/vmlinux.bin
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884670/
----------------
m68k:sun3_defconfig,m68k_defconfig
when: Mar 26
why: sun3_NCR5380.c: static decl of 'sun3scsi_proc_info' follows non-static
status:
fix:
ref: http://marc.info/?l=linux-next&m=133279244817422&w=2
m68k:allmodconfig
when: Mar 16
why: persistent_ram.c: implicit declaration of 'memblock_reserve'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884324/
ref: http://www.spinics.net/lists/linux-next/msg19343.html
----------------
mips:allmodconfig
when:
why: driver_pci_host.c: implicit declaration of function 'pcibios_enable_device'
status: one of many fixes mips needs...
fix: http://marc.info/?l=linux-wireless&m=133272031621916&w=2
ref: http://patchwork.ozlabs.org/patch/148614/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5807000/
----------------
parisc:allmodconfig
when:
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
parisc64:a500_defconfig
when:
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
------------------
powerpc:allyesconfig
when: May 18 2009, 22:11
why: fat ass kernel with everything simply won't link
status: need to fix build config to ignore the final link
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5806793/
------------------
sh4:***all-builds***
when: Feb 24, 17:38
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
------------------
um:um-defconfig
when: Sep 16 2010, 01:28
why: os-Linux/start_up.c: error: 'PTRACE_SETOPTIONS' undeclared
status: clearly broken forever, so does anyone care?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/target/2979/
^ permalink raw reply
* [PATCH] scsi: arm: fix compilation
From: Alexey Dobriyan @ 2012-03-27 20:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: James Bottomley, Paul Gortmaker, linux-next@vger.kernel.org,
linux-scsi@vger.kernel.org
In-Reply-To: <20120328014900.4ac23b9c65831393cae1eb1b@canb.auug.org.au>
Add seq_file.h for seq_file stuff.
Broken by commit bb6c20445c1bdd1c49ac5e76801211116694e3b9
"[SCSI] arm: convert drivers to scsi proc_ops"
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
drivers/scsi/arm/arxescsi.c | 1 +
drivers/scsi/arm/cumana_2.c | 1 +
drivers/scsi/arm/eesox.c | 1 +
drivers/scsi/arm/fas216.c | 1 +
drivers/scsi/arm/powertec.c | 1 +
5 files changed, 5 insertions(+)
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -25,6 +25,7 @@
#include <linux/ioport.h>
#include <linux/proc_fs.h>
#include <linux/unistd.h>
+#include <linux/seq_file.h>
#include <linux/stat.h>
#include <linux/delay.h>
#include <linux/init.h>
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -19,6 +19,7 @@
#include <linux/module.h>
#include <linux/blkdev.h>
#include <linux/kernel.h>
+#include <linux/seq_file.h>
#include <linux/string.h>
#include <linux/ioport.h>
#include <linux/proc_fs.h>
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -25,6 +25,7 @@
#include <linux/module.h>
#include <linux/blkdev.h>
#include <linux/kernel.h>
+#include <linux/seq_file.h>
#include <linux/string.h>
#include <linux/ioport.h>
#include <linux/proc_fs.h>
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -40,6 +40,7 @@
#include <linux/string.h>
#include <linux/ioport.h>
#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
#include <linux/delay.h>
#include <linux/bitops.h>
#include <linux/init.h>
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -10,6 +10,7 @@
#include <linux/module.h>
#include <linux/blkdev.h>
#include <linux/kernel.h>
+#include <linux/seq_file.h>
#include <linux/string.h>
#include <linux/ioport.h>
#include <linux/proc_fs.h>
^ permalink raw reply
* new location of the bluetooth tree
From: Gustavo Padovan @ 2012-03-27 17:12 UTC (permalink / raw)
To: linux-next; +Cc: Marcel Holtmann, Johan Hedberg, davem, linville
Hi,
We have just updated the address of the bluetooth-next tree, we now have a
shared tree where all maintainers can commit to. The new address is:
git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
The old tree will be deleted and is not valid anymore.
Gustavo
^ permalink raw reply
* Re: Commit "arm: convert drivers to scsi proc_ops" breaks linux-next
From: Stephen Rothwell @ 2012-03-27 14:49 UTC (permalink / raw)
To: James Bottomley
Cc: Paul Gortmaker, adobriyan@gmail.com, linux-next@vger.kernel.org,
linux-scsi@vger.kernel.org
In-Reply-To: <1332838284.2883.22.camel@dabdike>
[-- Attachment #1: Type: text/plain, Size: 1910 bytes --]
Hi James,
On Tue, 27 Mar 2012 08:51:25 +0000 James Bottomley <jbottomley@parallels.com> wrote:
>
> On Mon, 2012-03-26 at 22:51 -0400, Paul Gortmaker wrote:
> >
> > This error showed up in linux-next today:
> >
> > CC drivers/scsi/arm/powertec.o
> > drivers/scsi/arm/powertec.c: In function 'powertecscsi_proc_show':
> > drivers/scsi/arm/powertec.c:199: error: dereferencing pointer to incomplete type
> > drivers/scsi/arm/powertec.c:202: error: implicit declaration of function 'seq_printf'
> > drivers/scsi/arm/powertec.c: In function 'powertecscsi_proc_open':
> > drivers/scsi/arm/powertec.c:214: error: implicit declaration of function 'single_open'
> > drivers/scsi/arm/powertec.c: At top level:
> > drivers/scsi/arm/powertec.c:250: error: 'seq_read' undeclared here (not in a function)
> > drivers/scsi/arm/powertec.c:251: error: 'seq_lseek' undeclared here (not in a function)
> > drivers/scsi/arm/powertec.c:252: error: 'single_release' undeclared here (not in a function)
> >
> > and a bisect leads to this:
> >
> > --------------
> > commit bb6c20445c1bdd1c49ac5e76801211116694e3b9
> > Author: Alexey Dobriyan <adobriyan@gmail.com>
> > Date: Wed Feb 22 22:46:23 2012 +0300
> >
> > [SCSI] arm: convert drivers to scsi proc_ops
> >
> > Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
> > Signed-off-by: James Bottomley <JBottomley@Parallels.com>
> > --------------
>
> Could you dig a little deeper on this one? seq_printf is defined in
> include/linux/seq_file.h which is included by this commit. I can't see
> why the function prototype should end up undefined.
>
> Could the include guards for this file be getting set erroneously
> somehow?
This patch added seq_file.h to drivers/scsi/arm/acornscsi.c, but not to
drivers/scsi/arm/powertec.c .
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the battery tree
From: Anton Vorontsov @ 2012-03-27 13:03 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Arun Murthy, Linus Walleij,
Samuel Ortiz
In-Reply-To: <20120327084414.dacbf074e0f4ddd65ff3ecfb@canb.auug.org.au>
On Tue, Mar 27, 2012 at 08:44:14AM +1100, Stephen Rothwell wrote:
> Hi Anton,
>
> On Mon, 26 Mar 2012 20:11:32 +0400 Anton Vorontsov <cbouatmailru@gmail.com> wrote:
> >
> > I pulled my current battery tree into next-20120326, and I can't reproduce
> > the issue (using allmodconfig on x86_64).
>
> I have moved the battery tree to after the mfd tree in my merge sequence
> so we will see if that helps. I really hate having ordering dependencies
> in linux-next (since they change over time and people have to remember to
> tell me and to send stuff to Linus in the right order). Also, it means
> that you are not testing exactly what you are sending to me - I assume
> that your testing must be including the mfd tree somehow.
>
> These sort of things should be fixed by having the common code in a
> separate (stable) branch that is merged into both trees. Or in some
> cases by merely cherry-picking a very small number of commits from one
> tree to the other.
Yes, I was thinking about cherry-picking a few MFD patches, but
decided not to as the driver is quite big and completely new, so
it would have some glitches anyway, and thus would need fixups.
One less, one more.
But for such drivers I usually give my 'Acked-by' so that
patches could be merged via single tree (i.e. mfd). But nobody
asked me in this case.
Thanks,
--
Anton Vorontsov
Email: cbouatmailru@gmail.com
^ permalink raw reply
* Re: linux-next: Tree for Feb 2 (kvmtool)
From: Pekka Enberg @ 2012-03-27 10:19 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Sasha Levin, Asias He,
kvm@vger.kernel.org, mingo
In-Reply-To: <4F2B1C1B.1040700@xenotime.net>
On Thu, 2 Feb 2012, Randy Dunlap wrote:
> On 02/01/2012 07:45 PM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20120201:
>
>
> On some randconfig i386 builds, I am seeing this:
>
> warning: (KVMTOOL_TEST_ENABLE && AMD_IOMMU) selects PCI_MSI which has unmet direct dependencies (PCI && ARCH_SUPPORTS_MSI)
>
> because ARCH_SUPPORTS_MSI needs both X86_LOCAL_APIC and X86_IO_APIC
> but configs don't necessarily have both of them enabled.
>
> Do you want to add more selects here?
> (this mess could continue for quite some time with other kconfig symbols)
Ping? Sasha, Ingo, thoughts?
Pekka
^ permalink raw reply
* Re: Commit "arm: convert drivers to scsi proc_ops" breaks linux-next
From: James Bottomley @ 2012-03-27 8:51 UTC (permalink / raw)
To: Paul Gortmaker
Cc: adobriyan@gmail.com, linux-next@vger.kernel.org,
linux-scsi@vger.kernel.org
In-Reply-To: <20120327025100.GD26825@windriver.com>
On Mon, 2012-03-26 at 22:51 -0400, Paul Gortmaker wrote:
> Hi Alexey,
>
> This error showed up in linux-next today:
>
> CC drivers/scsi/arm/powertec.o
> drivers/scsi/arm/powertec.c: In function 'powertecscsi_proc_show':
> drivers/scsi/arm/powertec.c:199: error: dereferencing pointer to incomplete type
> drivers/scsi/arm/powertec.c:202: error: implicit declaration of function 'seq_printf'
> drivers/scsi/arm/powertec.c: In function 'powertecscsi_proc_open':
> drivers/scsi/arm/powertec.c:214: error: implicit declaration of function 'single_open'
> drivers/scsi/arm/powertec.c: At top level:
> drivers/scsi/arm/powertec.c:250: error: 'seq_read' undeclared here (not in a function)
> drivers/scsi/arm/powertec.c:251: error: 'seq_lseek' undeclared here (not in a function)
> drivers/scsi/arm/powertec.c:252: error: 'single_release' undeclared here (not in a function)
>
> and a bisect leads to this:
>
> --------------
> commit bb6c20445c1bdd1c49ac5e76801211116694e3b9
> Author: Alexey Dobriyan <adobriyan@gmail.com>
> Date: Wed Feb 22 22:46:23 2012 +0300
>
> [SCSI] arm: convert drivers to scsi proc_ops
>
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
> --------------
Could you dig a little deeper on this one? seq_printf is defined in
include/linux/seq_file.h which is included by this commit. I can't see
why the function prototype should end up undefined.
Could the include guards for this file be getting set erroneously
somehow?
James
^ permalink raw reply
* Re: linux-next: build failure after merge of the slave-dma tree
From: Vinod Koul @ 2012-03-27 8:33 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Javier Martin, Sascha Hauer
In-Reply-To: <20120327115232.ef58a6f97da2d29ed3c8bdb6@canb.auug.org.au>
On Tue, 2012-03-27 at 11:52 +1100, Stephen Rothwell wrote:
> Hi Vinod,
>
> After merging the slave-dma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/dma/imx-dma.c:31:22: fatal error: mach/dma.h: No such file or directory
>
> Caused by commit 6bd081277ea0 ("dmaengine: imx-dma: merge old dma-v1.c
> with imx-dma.c").
Thanks Stephen,
This should have depends on ARCH_MXS at least and should not have built
for x86_64. Below patch should fix it and I will apply this.
>
> I have used the slave-dma tree from next-20120326 for today.
>
> I was wondering why this new work appeared during the merge window ...
I had this series pending and wanted to get this merged but it didn't
apply for me last week and I was out for the long weekend :(
So merged on first chance I got back.
Tree is frozen now, barring any other hiccups. Sorry for the issue
--------------------------------x-------------------x----------------------
>From 9da98b21787488f9d99b7f93b42aee95bfd07c49 Mon Sep 17 00:00:00 2001
From: Vinod Koul <vinod.koul@linux.intel.com>
Date: Tue, 27 Mar 2012 13:53:00 +0530
Subject: [PATCH] dmaengine: imx: fix the build failure on x64
commit 6bd081277ea0 "dmaengine: imx-dma: merge old dma-v1.c with
imx-dma.c" removed the dependency in config for the imx dma driver,
whereas it should depend on ARCH_MXS
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
---
drivers/dma/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index b4a53a0..34e48d9 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -230,6 +230,7 @@ config IMX_SDMA
config IMX_DMA
tristate "i.MX DMA support"
+ depends on ARCH_MXC
select DMA_ENGINE
help
Support the i.MX DMA engine. This engine is integrated into
--
1.7.0.4
--
~Vinod
^ permalink raw reply related
* Re: linux-next: manual merge of the input tree with Linus' tree
From: Dmitry Torokhov @ 2012-03-27 7:33 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jason Gerecke, Chris Bagwell
In-Reply-To: <20120327121610.e39e648811d5b00ae328077b@canb.auug.org.au>
Hi Stephen,
On Tue, Mar 27, 2012 at 12:16:10PM +1100, Stephen Rothwell wrote:
> Hi Dmitry,
>
> Today's linux-next merge of the input tree got a conflict in
> drivers/input/tablet/wacom_sys.c between commit 24e3e5ae1e4c ("Input:
> wacom - fix physical size calculation for 3rd-gen Bamboo") from Linus'
> tree and commit 16bf288c4be6 ("Input: wacom - create inputs when wireless
> connect") from the input tree.
>
> The latter seems to incorporate the former, so I used that.
Thank you. I merged the branches and resolved conflict so you should not
see it anymore.
Thanks.
--
Dmitry
^ permalink raw reply
* Re: linux-next: build failure after merge of the scsi tree
From: James Bottomley @ 2012-03-27 7:29 UTC (permalink / raw)
To: Greg KH; +Cc: Stephen Rothwell, linux-next, linux-kernel, Alexey Dobriyan
In-Reply-To: <20120326140721.GA19827@kroah.com>
On Mon, 2012-03-26 at 07:07 -0700, Greg KH wrote:
> On Mon, Mar 26, 2012 at 08:57:21AM +0100, James Bottomley wrote:
> > On Mon, 2012-03-26 at 12:17 +1100, Stephen Rothwell wrote:
> > > Hi James,
> > >
> > > After merging the scsi tree, today's linux-next build (x86_64 allmodconfig)
> > > failed like this:
> > >
> > > drivers/staging/keucr/scsiglue.c:349:2: error: unknown field 'proc_info' specified in initializer
> > > drivers/staging/rts_pstor/rtsx.c:258:2: error: unknown field 'proc_info' specified in initializer
> > > drivers/staging/rts5139/rts51x_scsi.c:2190:2: error: unknown field 'proc_info' specified in initializer
> > >
> > > Caused by commit 104c4fe25dc9 ("[SCSI] remove scsi_host_template::proc_info").
> > >
> > > Since this is a staging driver, I applied these following patches:
> >
> > Yes, that looks about right, thanks. We haven't seen anything about
> > these drivers on the SCSI list, so I've no idea where they are in
> > development.
>
> Why is new patches going into your tree right now, during the 3.4 merge
> window? API changes should have happened weeks ago, to let others fix
> up things like this.
Yes, I'll defer this change to the next merge window.
James
> As for the "where they are in development", they vary, but, a simple
> grep should have shown you that these in-kernel drivers should also be
> fixed up, or at the least, give me the heads up to let me do it for you.
>
> Care to send me the patch that causes this problem so I can create a fix
> for this?
>
> thanks,
>
> greg k-h
^ permalink raw reply
* Re: [-next] m68k proc_ops breakage
From: James Bottomley @ 2012-03-27 7:22 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Alexey Dobriyan, scsi, Linux-Next
In-Reply-To: <CAMuHMdVQ9pxfRz899KVdAHhcspnhYU_H5DRCwRcsQY8cpZUqZw@mail.gmail.com>
On Mon, 2012-03-26 at 22:06 +0200, Geert Uytterhoeven wrote:
> m68k/defconfig:
>
> In file included from drivers/scsi/atari_scsi.c:1091:
> drivers/scsi/atari_NCR5380.c: In function ‘NCR5380_print_status’:
> drivers/scsi/atari_NCR5380.c:736: error: implicit declaration of
> function ‘NCR5380_proc_info’
> drivers/scsi/atari_NCR5380.c: At top level:
> drivers/scsi/atari_NCR5380.c:767: error: static declaration of
> ‘NCR5380_proc_info’ follows non-static declaration
> drivers/scsi/atari_NCR5380.c:736: error: previous implicit declaration
> of ‘NCR5380_proc_info’ was here
> make[1]: *** [drivers/scsi/atari_scsi.o] Error 1
>
>
> m68k/sun3_defconfig:
>
> In file included from drivers/scsi/sun3_scsi.c:628:
> drivers/scsi/sun3_NCR5380.c: In function ‘NCR5380_print_status’:
> drivers/scsi/sun3_NCR5380.c:678: error: implicit declaration of
> function ‘sun3scsi_proc_info’
> drivers/scsi/sun3_NCR5380.c: At top level:
> drivers/scsi/sun3_NCR5380.c:709: error: static declaration of
> ‘sun3scsi_proc_info’ follows non-static declaration
> drivers/scsi/sun3_NCR5380.c:678: error: previous implicit declaration
> of ‘sun3scsi_proc_info’ was here
> make[1]: *** [drivers/scsi/sun3_scsi.o] Error 1
>
> In file included from drivers/scsi/sun3_scsi_vme.c:571:
> drivers/scsi/sun3_NCR5380.c: In function ‘NCR5380_print_status’:
> drivers/scsi/sun3_NCR5380.c:678: error: implicit declaration of
> function ‘sun3scsi_proc_info’
> drivers/scsi/sun3_NCR5380.c: At top level:
> drivers/scsi/sun3_NCR5380.c:709: error: static declaration of
> ‘sun3scsi_proc_info’ follows non-static declaration
> drivers/scsi/sun3_NCR5380.c:678: error: previous implicit declaration
> of ‘sun3scsi_proc_info’ was here
> make[1]: *** [drivers/scsi/sun3_scsi_vme.o] Error 1
Yes, the proc_ops conversion isn't quite ready. I'll hold it over to
the next merge window so we can fix stuff like this.
James
^ permalink raw reply
* linux-next: Tree for Mar 27
From: Stephen Rothwell @ 2012-03-27 5:27 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 33528 bytes --]
Hi all,
Reminder: please do not add stuff destined for v3.5 to linux-next
included trees/branches until after v3.4-rc1 has been released.
Changes since 20120326:
Lots of conflicts move between trees and disappear as things are merged
into Linus' tree.
The slave-dma tree gained a conflict against Linus' tree and a build
failure so I used the version from next-20120326.
The input tree gained a conflict against Linus' tree.
The mmc tree gained conflicts against the s5p tree, I used the version
from next-20120326.
The battery tree lost its its build failure since I moved it after the
mfd tree.
The akpm tree lost a patch that turned up elsewhere and gained conflict
against the tip tree.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/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 25 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (e22057c Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen)
Merging fixes/master (88ebdda Merge tag 'for-3.3' of git://openrisc.net/jonas/linux)
Merging kbuild-current/rc-fixes (42f1c01 coccicheck: change handling of C={1,2} when M= is set)
Merging arm-current/fixes (a0feb6d ARM: 7358/1: perf: add PMU hotplug notifier)
Merging m68k-current/for-linus (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation)
Merging powerpc-merge/merge (e22057c Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen)
Merging sparc/master (e0adb99 sparc32: Add -Av8 to assembler command line.)
Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576)
Merging net/master (50269e1 net: add a truesize parameter to skb_add_rx_frag())
Merging sound-current/for-linus (6681bc0 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 (4949be1 PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled)
Merging wireless/master (643c61e rtlwifi: rtl8192ce: rtl8192cu: rtl8192de: Fix low-gain setting when scanning)
Merging driver-core.current/driver-core-linus (fde7d90 Linux 3.3-rc7)
Merging tty.current/tty-linus (fde7d90 Linux 3.3-rc7)
Merging usb.current/usb-linus (fde7d90 Linux 3.3-rc7)
Merging staging.current/staging-linus (fde7d90 Linux 3.3-rc7)
Merging char-misc.current/char-misc-linus (c16fa4f Linux 3.3)
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 (10ce3cc Merge branch 'next' into for-linus)
Merging md-current/for-linus (ecb178b md: Add judgement bb->unacked_exist in function md_ack_all_badblocks().)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (ff0a70f crypto: twofish-x86_64-3way - module init/exit functions should be static)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging devicetree-current/devicetree/merge (29f141f Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge)
Merging spi-current/spi/merge (a5ab629 Fix section mismatch in spi-pl022.c)
Merging gpio-current/gpio/merge (7e3a70f gpio: Add missing spin_lock_init in gpio-ml-ioh driver)
Merging arm/for-next (467fa4e Merge branch 'acorn' into for-next)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/c6x/Kconfig
CONFLICT (content): Merge conflict in arch/arm/kernel/process.c
CONFLICT (content): Merge conflict in arch/arm/common/gic.c
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 (d782c13 Merge branch 'next/soc-exynos5250-gpio' into for-next)
Merging tegra/for-next (e8ce8f9 Merge branch 'for-3.4/cleanup-and-fixes' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/fuse.c
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (1762275 blackfin: clean up string bfin_dma_5xx after rename.)
Merging c6x/for-linux-next (fde7d90 Linux 3.3-rc7)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Merging ia64/next (5cd288c Merge branch 'pstore' into next)
Merging m68k/for-next (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation)
Merging m68knommu/for-next (ae909ea m68knommu: factor more common ColdFire cpu reset code)
Merging microblaze/next (e02db0a microblaze: Handle TLB skip size dynamically)
Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next)
Merging openrisc/for-upstream (fa8d9d7 OpenRISC: Remove memory_start/end prototypes)
Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next)
Merging powerpc/next (e22057c Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen)
Merging 4xx/next (b5594a7 powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board)
Merging mpc5xxx/next (7b6bb64 powerpc/5200: convert mpc5200 to use of_platform_populate())
Merging galak/next (5a0acea powerpc/qe: Update the SNUM table for MPC8569 Rev2.0)
Merging s390/features (5d3b56f [S390] register cpu devices for SMP=n)
Merging sparc-next/master (e9b57cc sparc: Use vsprintf extention %pf with builtin_return_address)
Merging tile/master (48b25c4 [PATCH v3] ipc: provide generic compat versions of IPC syscalls)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (c666601 rbd: move snap_rwsem to the device, rename to header_rwsem)
Merging cifs/master (934e18b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
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 (e703c20 ext3: fix start and len arguments handling in ext3_trim_fs())
Merging ext4/dev (9d547c3 vfs: remove unused superblock helpers)
Merging fuse/for-next (4273b79 fuse: O_DIRECT support for files)
Merging gfs2/master (e22057c Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen)
Merging logfs/master (e22057c Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen)
Merging nfs/linux-next (250f671 Merge tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux)
Merging nfsd/nfsd-next (ab4684d NFSD: Fix nfs4_verifier memory alignment)
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 (5bdad93 9p: statfs should not override server f_type)
Merging ubifs/linux-next (5a1f36c UBIFS: improve error messages)
Merging xfs/for-next (1c2ccc6 fs: xfs: fix section mismatch in linux-next)
Merging vfs/for-next (07c0c5d ext4: initialization of ext4_li_mtx needs to be done earlier)
Merging pci/linux-next (1488d51 PCI: Bjorn gets PCI hotplug too)
Merging hid/for-next (d464c92 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging quilt/i2c (81b2104 i2c-algo-bit: Don't resched on clock stretching)
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 (bbceeee i2c-eg20t: Remove write-only variables)
Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (575d177 hwmon: max6639: Convert to dev_pm_ops)
Merging quilt/kernel-doc (28ebb24 Documentation: replace install commands with softdeps)
Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
Merging v4l-dvb/master (153fb4d Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (4904b4b Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (b8cec3c pata_cmd64x: implement sff_irq_check() method)
Merging infiniband/for-next (5ad19b0 Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next)
Merging acpi/next (be6fb23 Merge branch 'acpica' into next)
CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (19f8399 Merge branch 'iso-flush' into for-next)
Merging ubi/linux-next (cc83146 UBI: rename MOVE_CANCEL_BITFLIPS to MOVE_TARGET_BITFLIPS)
Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used)
Merging scsi/master (7ef79ae [SCSI] vmw_pvscsi: Try setting host->max_id as suggested by the device.)
Applying: scsi: disable broken staging driver
Applying: scsi: disable more staging drivers due to scsi breakage
Merging target-updates/for-next (187e70a ib_srpt: Fix srpt_handle_cmd send_ioctx->ioctx_kref leak on exception)
Merging target-merge/for-next-merge (06de5ee tcm_qla2xxx: Add >= 24xx series fabric module for target-core)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (efb1224 Merge branches 'devel' and 'rnc-devel' into all)
Merging slave-dma/next (660cd0d dmaengine: i.MX: Fix merge of cookie branch.)
CONFLICT (content): Merge conflict in sound/soc/mxs/mxs-pcm.c
CONFLICT (content): Merge conflict in sound/soc/imx/imx-pcm-dma-mx2.c
CONFLICT (content): Merge conflict in sound/soc/ep93xx/ep93xx-pcm.c
CONFLICT (content): Merge conflict in drivers/mmc/host/atmel-mci.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/Kconfig
CONFLICT (modify/delete): arch/arm/include/asm/hardware/pl330.h deleted in slave-dma/next and modified in HEAD. Version HEAD of arch/arm/include/asm/hardware/pl330.h left in tree.
CONFLICT (modify/delete): arch/arm/common/pl330.c deleted in slave-dma/next and modified in HEAD. Version HEAD of arch/arm/common/pl330.c left in tree.
$ git rm -f arch/arm/common/pl330.c arch/arm/include/asm/hardware/pl330.h
Applying: DMA: PL330: update for code movement
$ git reset --hard HEAD^
Merging refs/next/20120326/slave-dma
CONFLICT (content): Merge conflict in sound/soc/mxs/mxs-pcm.c
CONFLICT (content): Merge conflict in sound/soc/imx/imx-pcm-dma-mx2.c
CONFLICT (content): Merge conflict in sound/soc/ep93xx/ep93xx-pcm.c
CONFLICT (content): Merge conflict in drivers/mmc/host/atmel-mci.c
CONFLICT (modify/delete): arch/arm/include/asm/hardware/pl330.h deleted in refs/next/20120326/slave-dma and modified in HEAD. Version HEAD of arch/arm/include/asm/hardware/pl330.h left in tree.
CONFLICT (modify/delete): arch/arm/common/pl330.c deleted in refs/next/20120326/slave-dma and modified in HEAD. Version HEAD of arch/arm/common/pl330.c left in tree.
$ git rm -f arch/arm/common/pl330.c arch/arm/include/asm/hardware/pl330.h
[master 5856220] Merge commit 'refs/next/20120326/slave-dma'
Applying: DMA: PL330: update for code movement
[master 10f0d58] Merge commit 'refs/next/20120326/slave-dma'
Merging dmaengine/next (d07a74a dmaengine: fix missing 'cnt' in ?: in dmatest)
Merging net-next/master (3556485 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging wireless-next/master (8a78335 usbnet: consider device busy at each recieved packet)
Merging bluetooth/master (1c3b31a Bluetooth: Remove sk parameter from l2cap_chan_create())
Merging mtd/master (3c3e51d Merge ../linux-2.6 to bring in 3.3-rc fixes already merged)
Merging l2-mtd/master (282cb52 mtd: docg3 add protection against concurrency)
CONFLICT (content): Merge conflict in sound/soc/mxs/mxs-pcm.h
CONFLICT (content): Merge conflict in fs/jffs2/fs.c
CONFLICT (content): Merge conflict in fs/jffs2/compr.c
CONFLICT (content): Merge conflict in drivers/mtd/nand/gpmi-nand/gpmi-lib.c
CONFLICT (content): Merge conflict in drivers/mtd/chips/cfi_cmdset_0002.c
CONFLICT (content): Merge conflict in drivers/mmc/host/mxs-mmc.c
CONFLICT (content): Merge conflict in drivers/dma/mxs-dma.c
Merging crypto/master (2dc9b5d padata: Fix race on sequence number wrap)
Merging sound/for-next (6a0d4b2 Merge branch 'topic/hda' into for-next)
Merging sound-asoc/for-next (41ba6b7 ASoC: dmaengine_pcm: use dmaengine cyclic wrapper)
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 arch/arm/kernel/kprobes.c
Merging input/next (3183968 Input: amijoy - add missing platform check)
CONFLICT (content): Merge conflict in drivers/input/tablet/wacom_sys.c
Merging input-mt/for-next (7491f3d bcm5974: Add pointer and buttonpad properties)
Merging block/for-next (bc67f63 cciss: Fix scsi tape io with more than 255 scatter gather elements)
Merging quilt/device-mapper (b5af0b2 This device-mapper target creates a read-only device that transparently validates the data on one underlying device against a pre-generated tree of cryptographic checksums stored on a second device.)
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)
CONFLICT (content): Merge conflict in drivers/pcmcia/soc_common.c
Merging mmc/mmc-next (4d8e8a6 mmc: sh_mmcif: simplify bitmask macros)
CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-s3c.c
CONFLICT (modify/delete): arch/arm/mach-exynos/clock.c deleted in HEAD and modified in mmc/mmc-next. Version mmc/mmc-next of arch/arm/mach-exynos/clock.c left in tree.
$ git reset --hard
Merging refs/next/20120326/mmc
CONFLICT (content): Merge conflict in include/linux/mmc/host.h
CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc_pio.c
CONFLICT (content): Merge conflict in drivers/mmc/host/sh_mmcif.c
CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-s3c.c
CONFLICT (content): Merge conflict in drivers/mmc/host/atmel-mci.c
CONFLICT (content): Merge conflict in drivers/mmc/core/host.h
CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
[master a72c6b7] Merge commit 'refs/next/20120326/mmc'
Merging kgdb/kgdb-next (53c40f5 kdb: Add message about CONFIG_DEBUG_RODATA on failure to install breakpoint)
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 (ecb178b md: Add judgement bb->unacked_exist in function md_ack_all_badblocks().)
Merging mfd/for-next (b8589e2 gpio/twl: Add DT support to gpio-twl4030 driver)
CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500.h
CONFLICT (content): Merge conflict in drivers/mfd/twl-core.c
CONFLICT (content): Merge conflict in drivers/mfd/ab8500-core.c
Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling)
Merging drm/drm-next (5466c7b drm/i915: use DDC_ADDR instead of hard-coding it)
Merging fbdev/fbdev-next (6bff98b Revert "video:uvesafb: Fix oops that uvesafb try to execute NX-protected page")
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 (9300928 regulator: Do proper shift to set correct bit for DC[2|5]_HIB_MODE setting)
Merging security/next (09f61cd Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into next)
Merging selinux/master (ecf093d SELinux: add default_type statements)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (5fd051d watchdog: txx9wdt: fix timeout)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (7de4730 Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' 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 (f1f996b kcore: fix spelling in read_kcore() comment)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (f2791d7 PM / Runtime: don't forget to wake up waitqueue on failure)
Merging apm/for-next (b4a133d Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
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 (87bf5ab spi/fsl-espi: Make sure pm is within 2..32)
Merging tip/auto-latest (e7590cd Merge branch 'perf/urgent')
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging rcu/rcu/next (1cc8596 rcu: Stop spurious warnings from synchronize_sched_expedited)
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 cgroup/for-next (3ce3230 cgroup: Walk task list under tasklist_lock in cgroup_enable_task_cg_list)
Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3)
Merging kvm/linux-next (f8753c5 KVM: Convert intx_mask_lock to spin lock)
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 (2faaa4d 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 (e06ffa1 workqueue: use percpu allocator for cwq on UP)
Merging drivers-x86/linux-next (86924de acer-wmi: add quirk table for video backlight vendor mode)
CONFLICT (content): Merge conflict in arch/x86/platform/mrst/mrst.c
CONFLICT (content): Merge conflict in arch/x86/platform/geode/Makefile
CONFLICT (content): Merge conflict in arch/x86/Kconfig
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 (7d680ba Merge remote-tracking branch 'regmap/topic/introspection' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (adc80ae Tools: hv: Support enumeration from all the pools)
Merging tty/tty-next (fb8ebec serial: pxa: add clk_prepare/clk_unprepare calls)
Merging usb/usb-next (11207b6 net: qmi_wwan: add support for ZTE MF820D)
Merging staging/staging-next (bc01caf staging/zmem: Use lockdep_assert_held instead of spin_is_locked)
Merging char-misc/char-misc-next (b222258 misc: bmp085: Use unsigned long to store jiffies)
Merging tmem/linux-next (16c0cfa Merge branch 'stable/cleancache.v13' 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 (51dddfe ARM: u300: configure some pins as an example)
Merging moduleh/for-sfr (de2272c Merge branch 'device-3.4' into for-sfr)
CONFLICT (content): Merge conflict in lib/string.c
Merging vhost/linux-next (1e05b62 sh: use the the PCI channels's io_map_base)
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)
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/)
CONFLICT (content): Merge conflict in include/linux/virtio_ids.h
Merging irqdomain/irqdomain/next (409a6f6 Merge branch 'irqdomain-for-grant' of git://sources.calxeda.com/kernel/linux into irqdomain/next)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging gpio/gpio/next (8194c7c gpio/sodaville: Mark broken due to core irqdomain migration)
CONFLICT (content): Merge conflict in include/linux/mfd/tps65910.h
Merging arm-soc/for-next (61689b8 Merge branch 'next/cleanup' into for-next)
CONFLICT (content): Merge conflict in drivers/watchdog/ep93xx_wdt.c
CONFLICT (content): Merge conflict in drivers/mtd/nand/atmel_nand.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-gpio.c
CONFLICT (modify/delete): arch/arm/mach-vexpress/include/mach/io.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vexpress/include/mach/io.h left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-sh7377.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-sh7367.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7740.c
CONFLICT (modify/delete): arch/arm/mach-s3c24xx/common.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s3c24xx/common.h left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-msm/timer.c
CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/Kconfig
$ git rm -f arch/arm/mach-vexpress/include/mach/io.h
Merging kvmtool/master (20082f5 kvm tools: Fix realpath() error checking)
Merging dma-mapping/dma-mapping-next (e749a9f common: DMA-mapping: add NON-CONSISTENT attribute)
Merging dma-buf/for-next (9f28056 dma-buf: Correct dummy function declarations.)
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging cpuidle-cons/cpuidle_consol_pull (203b52e SH: shmobile: Consolidate time keeping and irq enable)
CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c
CONFLICT (add/add): Merge conflict in arch/arm/include/asm/cpuidle.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
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: 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: x86, olpc: add debugfs interface for EC commands
Applying: x86-olpc-add-debugfs-interface-for-ec-commands v3
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: x86: use this_cpu_xxx to replace percpu_xxx funcs
CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c
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: 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: unicore32: use block_sigmask()
Applying: net/netfilter/nfnetlink_acct.c: use linux/atomic.h
Applying: blackfin: use set_current_blocked() and block_sigmask()
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: vfs: increment iversion when a file is truncated
Applying: brlocks/lglocks: cleanups
Applying: vfs: fix dup_mnt_ns
Applying: hugetlbfs: lockdep annotate root inode properly
Applying: libfs: add simple_open()
Applying: scripts/coccinelle/api/simple_open.cocci: semantic patch for simple_open()
Applying: simple_open: automatically convert to simple_open()
Applying: simple_open-automatically-convert-to-simple_open-checkpatch-fixes
Applying: fs: symlink restrictions on sticky directories
Applying: fs-symlink-restrictions-on-sticky-directories-fix-2
Applying: fs: hardlink creation restrictions
Applying: fs-hardlink-creation-restrictions-fix
Applying: fs: hardlink creation restriction cleanup
Applying: mm: fix page-faults detection in swap-token logic
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: frv: use set_current_blocked() and block_sigmask()
Applying: sh: no need to reset handler if SA_ONESHOT
Applying: sh: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: alpha: use set_current_blocked() and 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: C6X: use set_current_blocked() and block_sigmask()
Applying: cpuidle: add a sysfs entry to disable specific C state for debug purpose.
Applying: cpuidle-add-a-sysfs-entry-to-disable-specific-c-state-for-debug-purpose-fix
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: cris: select GENERIC_ATOMIC64
Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
Applying: ceph, cifs, nfs, fuse: boolean and / or confusion
Applying: powerpc/eeh: remove eeh_event_handler()->daemonize()
Applying: arch/powerpc/platforms/pseries/eeh_event.c: slightly fix set_current_state() wart
Applying: MAINTAINERS: fix REMOTEPROC F: typo
Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
Applying: init/do_mounts.c: create /root if it does not exist
Applying: kmod: avoid deadlock from recursive kmod call
Applying: kmod-avoid-deadlock-by-recursive-kmod-call-fix
Applying: proc: clean up /proc/<pid>/environ handling
Applying: smp: introduce a generic on_each_cpu_mask() function
Applying: arm: move arm over to generic on_each_cpu_mask
Applying: tile: move tile to use generic on_each_cpu_mask
Applying: smp: add func to IPI cpus based on parameter func
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-fix
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update-fix
Applying: smp: add func to IPI cpus based on parameter func
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-v9-fix
Applying: slub: only IPI CPUs that have per cpu obj to flush
Applying: fs: only send IPI to invalidate LRU BH when needed
Applying: mm: only IPI CPUs to drain local pages if they exist
Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-update
Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-v9
Applying: lib/cpumask.c: remove __any_online_cpu()
Applying: arch/ia64: remove references to cpu_*_map
Applying: kexec: crash: don't save swapper_pg_dir for !CONFIG_MMU configurations
Applying: kexec: add further check to crashkernel
Applying: kdump x86: fix total mem size calculation for reservation
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: ipmi: decrease the IPMI message transaction time in interrupt mode
Applying: ipmi: increase KCS timeouts
Applying: ipmi: use a tasklet for handling received messages
Applying: ipmi: fix message handling during panics
Applying: ipmi: simplify locking
Applying: ipmi: use locks on watchdog timeout set on reboot
Applying: sysctl: use bitmap library functions
Applying: pidns: add reboot_pid_ns() to handle the reboot syscall
Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-fix
Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-checkpatch-fixes
Applying: nbd: rename the nbd_device variable from lo to nbd
Applying: fs/proc/namespaces.c: prevent crash when ns_entries[] is empty
Applying: radix-tree: introduce bit-optimized iterator
Applying: radix-tree-introduce-bit-optimized-iterator-v3
Applying: radix-tree-introduce-bit-optimized-iterator-v3-fix
Applying: radix-tree: rewrite gang lookup using iterator
Applying: radix-tree: use iterators in find_get_pages* functions
Applying: selftests: launch individual selftests from the main Makefile
Applying: selftests/Makefile: make `run_tests' depend on `all'
Applying: mm: move page-types.c from Documentation to tools/vm
Applying: mm: move slabinfo.c to tools/vm
Applying: mm: move hugepage test examples to tools/testing/selftests/vm
Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix
Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix-fix
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-fix
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix-2
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-set-new-mm_struct-exe_file-v2
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: c-r-prctl-add-ability-to-get-clear_tid_address-fix
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: notify_change(): check that i_mutex is held
Merging akpm (b7dff64 notify_change(): check that i_mutex is held)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the akpm tree with the tip tree
From: Stephen Rothwell @ 2012-03-27 4:57 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Alex Shi, Richard Weinberger,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 511 bytes --]
Hi all,
Today's linux-next merge of the akpm tree got a conflict in
arch/x86/kernel/process_64.c between commit 90e240142bd3 ("x86: Merge the
x86_32 and x86_64 cpu_idle() functions") from the tip tree and commit
54d16004d978 ("x86: use this_cpu_xxx to replace percpu_xxx funcs") from
the akpm tree.
The former moved the code to another file, so I did this change from the
latter (in enter_idle) to arch/x86/kernel/process.c.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the mmc tree with the s5p tree
From: Chris Ball @ 2012-03-27 3:29 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Kukjin Kim, Linus
In-Reply-To: <20120327141033.352dfd5cc4ee937ee7371860@canb.auug.org.au>
Hi,
On Mon, Mar 26 2012, Stephen Rothwell wrote:
> This conflict has been caused in part because you rebased your tree and
> copied some commits that used to be merged into your tree from a shared
> branch. Do *not* do that ... BTW, when you rebased those commits into
> your tree, you did not sign them either. This is exactly what Linus has
> just berated one of the other maintainers for ...
Ugh, I'm sorry for screwing this up.
> I am not fixing this conflict, I am just using the version of your tree
> that I have from next-20120326. Please fix your tree up properly.
I've reverted to the version in next-20120326 too, and will avoid rebasing.
Thanks,
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply
* linux-next: manual merge of the mmc tree with the s5p tree
From: Stephen Rothwell @ 2012-03-27 3:10 UTC (permalink / raw)
To: Chris Ball; +Cc: linux-next, linux-kernel, Kukjin Kim, Linus
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
Hi Chris,
This conflict has been caused in part because you rebased your tree and
copied some commits that used to be merged into your tree from a shared
branch. Do *not* do that ... BTW, when you rebased those commits into
your tree, you did not sign them either. This is exactly what Linus has
just berated one of the other maintainers for ...
I am not fixing this conflict, I am just using the version of your tree
that I have from next-20120326. Please fix your tree up properly.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Commit "arm: convert drivers to scsi proc_ops" breaks linux-next
From: Paul Gortmaker @ 2012-03-27 2:51 UTC (permalink / raw)
To: adobriyan; +Cc: JBottomley, linux-next, linux-scsi
Hi Alexey,
This error showed up in linux-next today:
CC drivers/scsi/arm/powertec.o
drivers/scsi/arm/powertec.c: In function 'powertecscsi_proc_show':
drivers/scsi/arm/powertec.c:199: error: dereferencing pointer to incomplete type
drivers/scsi/arm/powertec.c:202: error: implicit declaration of function 'seq_printf'
drivers/scsi/arm/powertec.c: In function 'powertecscsi_proc_open':
drivers/scsi/arm/powertec.c:214: error: implicit declaration of function 'single_open'
drivers/scsi/arm/powertec.c: At top level:
drivers/scsi/arm/powertec.c:250: error: 'seq_read' undeclared here (not in a function)
drivers/scsi/arm/powertec.c:251: error: 'seq_lseek' undeclared here (not in a function)
drivers/scsi/arm/powertec.c:252: error: 'single_release' undeclared here (not in a function)
and a bisect leads to this:
--------------
commit bb6c20445c1bdd1c49ac5e76801211116694e3b9
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date: Wed Feb 22 22:46:23 2012 +0300
[SCSI] arm: convert drivers to scsi proc_ops
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
--------------
I'm not sure why "new" commits are only showing up in linux-next with
just days left in the merge window, but can you have a look ASAP?
THanks,
Paul.
----------
git bisect start
# bad: [88b5d261d52f81806577e939c1744395b9f4edf9] Add linux-next specific files for 20120326
git bisect bad 88b5d261d52f81806577e939c1744395b9f4edf9
# good: [c16fa4f2ad19908a47c63d8fa436a1178438c7e7] Linux 3.3
git bisect good c16fa4f2ad19908a47c63d8fa436a1178438c7e7
# good: [f37ab0fba271e43edab0e3ae9fe644fcda455402] Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
git bisect good f37ab0fba271e43edab0e3ae9fe644fcda455402
# bad: [03797c27f6c50cd92e396cc31271bd73224239e0] Merge remote-tracking branch 'sound/for-next'
git bisect bad 03797c27f6c50cd92e396cc31271bd73224239e0
# bad: [9f9aa50fe5d555b356bfc34f135bc66d611fe573] Merge remote-tracking branch 'scsi/master'
git bisect bad 9f9aa50fe5d555b356bfc34f135bc66d611fe573
# good: [0cd69e8184c4242ca15494829d675606183e8c78] Merge remote-tracking branch 'arm/for-next'
git bisect good 0cd69e8184c4242ca15494829d675606183e8c78
# good: [8e52333b697339063e338b80560dec7e4396ce42] Merge remote-tracking branch 'fuse/for-next'
git bisect good 8e52333b697339063e338b80560dec7e4396ce42
# good: [21ea2bf9d8a875d79cbf1d70625a4a3cacfa9a64] Merge branch 'kbuild/kconfig' into kbuild/for-next
git bisect good 21ea2bf9d8a875d79cbf1d70625a4a3cacfa9a64
# good: [cf53892ca8c08d2ca7a553258d204c588d37ac87] Merge remote-tracking branch 'infiniband/for-next'
git bisect good cf53892ca8c08d2ca7a553258d204c588d37ac87
# bad: [7ef79ae61a1f5dbfcfda4b4fb01434692e283e3b] [SCSI] vmw_pvscsi: Try setting host->max_id as suggested by the device.
git bisect bad 7ef79ae61a1f5dbfcfda4b4fb01434692e283e3b
# bad: [104c4fe25dc9bde823ba4591e910a77071b98ab5] [SCSI] remove scsi_host_template::proc_info
git bisect bad 104c4fe25dc9bde823ba4591e910a77071b98ab5
# good: [2f97c74b58d2c2b3e0fd67ea1188f73b17f22c93] [SCSI] aha1740: convert to scsi proc_ops
git bisect good 2f97c74b58d2c2b3e0fd67ea1188f73b17f22c93
# good: [6852cc964c8a068d2a9ebe8b9dc922f6c0e29feb] [SCSI] usbstorage: convert to scsi proc_ops
git bisect good 6852cc964c8a068d2a9ebe8b9dc922f6c0e29feb
# good: [d11ea639a11b70ba8f88676af8df329481a701db] [SCSI] eata: convert to scsi proc_ops
git bisect good d11ea639a11b70ba8f88676af8df329481a701db
# good: [64d7ba67031f12b44a99978a2b108ed7d2f074dc] [SCSI] NCR5380: convert to scsi proc_ops
git bisect good 64d7ba67031f12b44a99978a2b108ed7d2f074dc
# bad: [d089e2cb5dffc1160b19a4e48d68cc583cf249ba] [SCSI] wd33c93: convert to scsi proc_ops
git bisect bad d089e2cb5dffc1160b19a4e48d68cc583cf249ba
# bad: [bb6c20445c1bdd1c49ac5e76801211116694e3b9] [SCSI] arm: convert drivers to scsi proc_ops
git bisect bad bb6c20445c1bdd1c49ac5e76801211116694e3b9
^ permalink raw reply
* Re: linux-next: triage for March 26th, 2012
From: Paul Gortmaker @ 2012-03-27 2:26 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
In-Reply-To: <20120327005307.GB26825@windriver.com>
On Mon, Mar 26, 2012 at 8:53 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> New breakage since last report:
> ARM:rpc_defconfig (scsi/arm/powertec.c: implicit 'seq_printf')
> ARM:omap2plus_defconfig (board-omap4panda.c: 'btwilink_device' undecl)
> m68k:sun3_defconfig,m68k_defconfig (sun3_NCR5380.c: static decl of
> 'sun3scsi_proc_info' follows non-static)
> ia64:defconfig (asm-offsets.c:322: unterm arg list invoking macro "DEFINE")
[...]
> ia64:defconfig
> when: Mar 26
> why: asm-offsets.c:322: unterminated arg list invoking macro "DEFINE"
> status:
> fix:
> ref:
Cause and trivial fix is here:
https://lkml.org/lkml/2012/3/26/496
Paul.
^ permalink raw reply
* linux-next: bad merge of asoc-3.4
From: Paul Gortmaker @ 2012-03-27 2:19 UTC (permalink / raw)
To: arnd; +Cc: linux-next, broonie
Hi Arnd,
Can you recheck the merge below? I think it needs this fix,
because a bisect on this failure led to your merge.
http://kisskb.ellerman.id.au/kisskb/buildresult/5968352/
Thanks,
Paul.
---
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 331f7cb..8bf8e99 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -114,7 +114,7 @@ static struct platform_device panda_abe_audio = {
.dev = {
.platform_data = &panda_abe_audio_data,
},
-}
+};
static struct platform_device btwilink_device = {
.name = "btwilink",
commit b9e1122c88996c20165b62e5be43cee644567ac4
Merge: 7068805 22f8d05
Author: Arnd Bergmann <arnd@arndb.de>
Date: Sat Mar 24 11:33:59 2012 +0000
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards
The asoc branch that was already merged into v3.4 contains some
board-level changes that conflict with patches we already have
here, so pull in that branch to resolve the conflicts.
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/mach-omap2/board-omap4panda.c
^ permalink raw reply related
* linux-next: manual merge of the input tree with Linus' tree
From: Stephen Rothwell @ 2012-03-27 1:16 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-next, linux-kernel, Jason Gerecke, Chris Bagwell
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
Hi Dmitry,
Today's linux-next merge of the input tree got a conflict in
drivers/input/tablet/wacom_sys.c between commit 24e3e5ae1e4c ("Input:
wacom - fix physical size calculation for 3rd-gen Bamboo") from Linus'
tree and commit 16bf288c4be6 ("Input: wacom - create inputs when wireless
connect") from the input tree.
The latter seems to incorporate 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
* linux-next: triage for March 26th, 2012
From: Paul Gortmaker @ 2012-03-27 0:53 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel, linux-scsi
Looks like some SCSI fallout today. (don't forget the builds lag
the tree creation by up to 24h.)
New breakage since last report:
ARM:rpc_defconfig (scsi/arm/powertec.c: implicit 'seq_printf')
ARM:omap2plus_defconfig (board-omap4panda.c: 'btwilink_device' undecl)
m68k:sun3_defconfig,m68k_defconfig (sun3_NCR5380.c: static decl of
'sun3scsi_proc_info' follows non-static)
ia64:defconfig (asm-offsets.c:322: unterm arg list invoking macro "DEFINE")
Randconfig fails that may or may not be new (by their very nature):
powerpc: mpc512x_shared.c: (fsl_diu_monitor_port declared in param list)
Builds that are fixed since last report:
ARM:cam60_defconfig
ARM:ap4evb_defconfig
ARM:mxs_defconfig (kallsyms bug, so probably not "fixed").
ARM:at91x40_defconfig
The following have fixes posted for quite some time now, but the fixes
haven't yet been integrated. Please have a look at these, as it would
be nice to have them in tree before wk2 of the merge window closes.
ARM:magician_defconfig
ARM:collie_defconfig
ARM:iop32x_defconfig,iop33x_defconfig
ARM:em_x270_defconfig
AVR32:defconfig
Note: The randconfig fails are only listed once and not tracked
in the below listing.
------------------------------------------------
Latest results at:
http://kisskb.ellerman.id.au/kisskb/branch/9/
Failures as of March 26th, 2012:
================================
AM33:asb2303_defconfig,asb2364_defconfig
when: Mar 15
why: cc1: error: unrecognized command line option '-mmem-funcs'
status: Possible fix from TonyB sent for review.
fix: http://marc.info/?l=linux-kernel&m=133185020313818&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5878400/
----------------
ARM:omap2plus_defconfig
when: Mar 26
why: board-omap4panda.c: 'btwilink_device' undeclared
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5968352/
ARM:rpc_defconfig
when: Mar 26
why: scsi/arm/powertec.c: implicit declaration 'seq_printf'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5967948/
ARM:u300_defconfig
when: Mar 24
why: coh901327_wdt.c: 'struct watchdog_device' has no member named 'timout'
status: reported (PaulG)
fix:
ref: http://marc.info/?l=linux-next&m=133259959823119&w=2
ARM:cm_x2xx_defconfig
when: Mar 19
why: it8152.c: redefinition of 'dma_set_coherent_mask'
status: bisected and reported (PaulG)
fix:
ref: http://marc.info/?l=linux-next&m=133226851818586&w=2
ARM:netx_defconfig,pnx4008_defconfig
when: Mar 14
why: net/core/pktgen.c: can't find a register in class 'GENERAL_REGS'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5869486/
ref: https://lkml.org/lkml/2012/3/13/670
ARM:collie_defconfig
when: Feb 14
why: locomolcd.c: error: 'sa1100fb_lcd_power' undeclared
status: fixed (PaulG) - pending integration
fix: http://marc.info/?l=linux-next&m=133105157730749&w=2
ref:
ARM:iop32x_defconfig,iop33x_defconfig
when: Nov 23
why: restart.c: implicit declaration of function 'soft_restart'
status: fixed (PaulG) - pending integration
fix: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-January/081461.html
fix: https://lkml.org/lkml/2012/3/14/253
ref:
ARM:ixp4xx_defconfig
when: Oct 26
why: gpio.h: implicit declaration of function '__gpio_get_value'
status: fixed (Imre Kaloz) - but possibly needs rework?
fix: https://lkml.org/lkml/2012/2/8/288
ref: https://lkml.org/lkml/2012/2/8/287
ARM:magician_defconfig
when: Feb 13
why: magician.c: unknown field 'dev' specified in initializer
status: fixed (PaulG) - pending integration
fix: http://marc.info/?l=linux-arm-kernel&m=133124258707457&w=2
ref: http://marc.info/?l=linux-next&m=133106325903524&w=2
ARM:em_x270_defconfig
when: Feb 14
why: em-x270.c: unknown field 'dev' specified in initializer
status: fixed (PaulG) - pending integration
fix: http://www.spinics.net/lists/arm-kernel/msg164012.html
ref: http://www.spinics.net/lists/arm-kernel/msg163135.html
ARM:raumfeld_defconfig
when: Nov 23
why: eeti_ts.c: implicit declaration of function 'irq_to_gpio'
status: perhaps broken since 2010? See ref below.
fix:
ref: http://www.gossamer-threads.com/lists/linux/kernel/1291618?do=post_view_threaded#1291618
ARM:arm-allnoconfig
when: forever
why: not supported
status: nothing pending, but patches accepted
fix: n/a
ref: https://lkml.org/lkml/2009/4/30/105
ref: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-January/081218.html
----------------
AVR32:defconfig
when: Mar 18
why: board.h: atmel_nand.h: No such file or directory
status: reported/fixed (PaulG)
fix: http://marc.info/?l=linux-arm-kernel&m=133239363802517&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5917107/
AVR32:allnoconfig
when: May 26 2010, 20:49
why: at32_map_usart: undefined reference to `atmel_default_console_device'
status:
fix:
ref:
---------------
bfin:***all-builds***
when: Jan 20, 22:13
why: undefined reference to [now multiple definition of] `vm_is_stack'
status: WIP, fix from Siddhesh Poyarekar
fix:
ref: http://marc.info/?l=linux-next&m=133269881015828&w=2
ref: http://marc.info/?l=linux-next&m=133104723928617&w=2
---------------
cris:***all-builds***
when: Mar 25, 22:05
why: include/linux/types.h:25: error expected ... before 'ino_t'
status:
fix:
ref:
----------------
crisv32:***all-builds***
when: Mar 25, 22:05
why: include/linux/types.h:25: error expected ... before 'ino_t'
status:
fix:
ref:
----------------
frv:defconfig
when: Mar 15
why: arch/frv/kernel/head.S operand out of range
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884666/
----------------
h8300:defconfig
when: Mar 15
why: time.c: implicit declaration of function 'get_irq_regs'
why: also seems gcc suffers an ICE
status: ICE bug lodged with gcc folks (TonyB)
fix:
ref: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52598
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884668/
----------------
ia64:defconfig
when: Mar 26
why: asm-offsets.c:322: unterminated arg list invoking macro "DEFINE"
status:
fix:
ref:
----------------
i386:allmodconfig
when: Mar 8, 20:41
why: ERROR: "mdfld_set_brightness" [drivers/gpu/drm/gma500/gma500_gfx.ko] undefined!
status:
fix:
ref: https://lkml.org/lkml/2012/3/24/122
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5878506/
----------------
m32r:m32700ut.smp_defconfig
when: Mar 15
why: No rule to make target `arch/m32r/boot/compressed/vmlinux.bin
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884670/
----------------
m68k:sun3_defconfig,m68k_defconfig
when: Mar 26
why: sun3_NCR5380.c: static decl of 'sun3scsi_proc_info' follows non-static
status:
fix:
ref: http://marc.info/?l=linux-next&m=133279244817422&w=2
m68k:allmodconfig
when: Mar 16
why: persistent_ram.c: implicit declaration of 'memblock_reserve'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884324/
ref: http://www.spinics.net/lists/linux-next/msg19343.html
----------------
mips:allmodconfig
when:
why: driver_pci_host.c: implicit declaration of function 'pcibios_enable_device'
status: one of many fixes mips needs...
fix: http://marc.info/?l=linux-wireless&m=133272031621916&w=2
ref: http://patchwork.ozlabs.org/patch/148614/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5807000/
----------------
parisc:allmodconfig
when:
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
parisc64:a500_defconfig
when:
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
------------------
powerpc:allyesconfig
when: May 18 2009, 22:11
why: fat ass kernel with everything simply won't link
status: need to fix build config to ignore the final link
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5806793/
------------------
sh4:***all-builds***
when: Feb 24, 17:38
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
------------------
tilegx:defconfig
when: Mar 19
why: `xfs_qm_exit' defined in discarded section `.exit.text' of fs/built-in.o
status:
fix:
ref: http://marc.info/?l=linux-next&m=133269971616104&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5924094/
------------------
um:um-defconfig
when: Sep 16 2010, 01:28
why: os-Linux/start_up.c: error: 'PTRACE_SETOPTIONS' undeclared
status: clearly broken forever, so does anyone care?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/target/2979/
^ 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