* Re: linux-next: Tree for Apr 20 (usb & target)
From: Nicholas A. Bellinger @ 2012-05-04 3:34 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: Greg KH, Randy Dunlap, Stephen Rothwell, linux-next, LKML,
linux-usb, target-devel, Felipe Balbi
In-Reply-To: <20120422190136.GA31242@linutronix.de>
On Sun, 2012-04-22 at 21:01 +0200, Sebastian Andrzej Siewior wrote:
> * Greg KH | 2012-04-21 08:34:02 [-0700]:
>
> >> > CONFIG_MODULES is not enabled.
> >> > CONFIG_TCM_USB_GADGET=y
> >> > CONFIG_USB_GADGET=y
> >>
> >> Sebastian + Greg-KH (Cc'ed), any ideas why this is the case here..?
> >
> >I have no idea, sorry.
>
> The short version:
> in order to fix this either move the usb-target-gadget to
> drivers/usb/gadget/Kconfig and make sure only one gadget can be compiled
> at a time or add some kind of depends.
>
> The longer version:
> This is a short comming of the gadget framework. We are able to build
> multiple UDCs at a time and we can build multiple gadgets _as_ modules.
> Since we can not bind & configure via an interface the whole thing works
> right now via "modprobe $gadget. There is some infrastructure to accept
> multiple UDCs/gadget but the *whole* thing is not complete.
> In non-modules mode you can only select one gadget at a time. With the
> target gadget living outside of usb/gadget selection it is possible to
> select both at the same time which causes the duplicate symbols here.
> A "quick" fix is not to define all the functions static and put
> maybe_unsued on each function to avoid warnings. This is only duct tape
> on top and I would prefer that nobody is sending such a patch. The
> result is hardly usefull by a user.
> A real fix would to get rid of the "#includes foo.c" and use a helper
> module/library instead.
> I tried this once and notice that the whole thing relies on
> static/global variables which are initialized once on modprobe. So
> with the second module loaded (read as rmmod $mod1 && modprobe $mod2)
> the gadget framework explodes. Once I noticed that, the patches got out
> of Felipe's tree before anyone noticed something. That means we should
> first get rid of the global variables and then maybe try again :)
>
Hey Sebastian & USB folks,
So I'm catching up on for-next-merge stuff after being away last week,
and ended up following your advice to just move tcm_usb_gadget code into
drivers/usb/gadget/ in to address the legacy requirements above..
After the recommended change, the in-kernel config using a single gadget
driver (the target) are able to build. Thanks for the detailed
explanation btw.. ;)
I've made the same change for tcm_usb_gadget in lio-core, and updated
for-next-merge with the following merge patch:
http://git.kernel.org/?p=linux/kernel/git/nab/target-pending.git;a=commit;h=0c41520201bc0933d65b8644173802778f426234
Please let me know if you have any other changes that should go into
sunday's linux-next build.
Thanks!
--nab
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the wireless tree
From: Stephen Rothwell @ 2012-05-04 3:21 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Eric Dumazet, John W. Linville,
Guy, Wey-Yi, alexander.duyck, alexander.h.duyck,
jeffrey.t.kirsher, linux-wireless
[-- Attachment #1: Type: text/plain, Size: 7266 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got conflicts in
drivers/net/wireless/iwlwifi/iwl-trans.h,
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c, and
drivers/net/wireless/iwlwifi/iwl-agn-rx.c between commit ed90542b0ce5
("iwlwifi: fix skb truesize underestimation") from the wireless tree and
various commits from the net-next tree.
This was anticipated and I have applied the fix supplied by John (see
below just to check). Thanks to John for this!
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-agn-rx.c
index 2247460,f941223..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
@@@ -787,25 -752,15 +751,24 @@@ static void iwlagn_pass_packet_to_mac80
iwlagn_set_decrypted_flag(priv, hdr, ampdu_status, stats))
return;
- skb = dev_alloc_skb(128);
+ /* Dont use dev_alloc_skb(), we'll have enough headroom once
+ * ieee80211_hdr pulled.
+ */
+ skb = alloc_skb(128, GFP_ATOMIC);
if (!skb) {
- IWL_ERR(priv, "dev_alloc_skb failed\n");
+ IWL_ERR(priv, "alloc_skb failed\n");
return;
}
+ hdrlen = min_t(unsigned int, len, skb_tailroom(skb));
+ memcpy(skb_put(skb, hdrlen), hdr, hdrlen);
+ fraglen = len - hdrlen;
+
+ if (fraglen) {
- int offset = (void *)hdr + hdrlen - rxb_addr(rxb);
++ int offset = (void *)hdr - rxb_addr(rxb) + rxb_offset(rxb);
- offset = (void *)hdr - rxb_addr(rxb) + rxb_offset(rxb);
- p = rxb_steal_page(rxb);
- skb_add_rx_frag(skb, 0, p, offset, len, len);
+ skb_add_rx_frag(skb, 0, rxb_steal_page(rxb), offset,
+ fraglen, rxb->truesize);
+ }
- iwl_update_stats(priv, false, fc, len);
/*
* Wake any queues that were stopped due to a passive channel tx
diff --cc drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index aa7aea1,d2239aa..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@@ -374,72 -373,89 +373,90 @@@ static void iwl_rx_handle_rxbuf(struct
if (WARN_ON(!rxb))
return;
- rxcb.truesize = PAGE_SIZE << hw_params(trans).rx_page_order;
- dma_unmap_page(trans->dev, rxb->page_dma,
- rxcb.truesize,
- DMA_FROM_DEVICE);
-
- rxcb._page = rxb->page;
- pkt = rxb_addr(&rxcb);
-
- IWL_DEBUG_RX(trans, "%s, 0x%02x\n",
- get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
+ dma_unmap_page(trans->dev, rxb->page_dma, max_len, DMA_FROM_DEVICE);
+ while (offset + sizeof(u32) + sizeof(struct iwl_cmd_header) < max_len) {
+ struct iwl_rx_packet *pkt;
+ struct iwl_device_cmd *cmd;
+ u16 sequence;
+ bool reclaim;
+ int index, cmd_index, err, len;
+ struct iwl_rx_cmd_buffer rxcb = {
+ ._offset = offset,
+ ._page = rxb->page,
+ ._page_stolen = false,
++ .truesize = max_len,
+ };
- len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
- len += sizeof(u32); /* account for status word */
- trace_iwlwifi_dev_rx(trans->dev, pkt, len);
+ pkt = rxb_addr(&rxcb);
- /* Reclaim a command buffer only if this packet is a response
- * to a (driver-originated) command.
- * If the packet (e.g. Rx frame) originated from uCode,
- * there is no command buffer to reclaim.
- * Ucode should set SEQ_RX_FRAME bit if ucode-originated,
- * but apparently a few don't get set; catch them here. */
- reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME);
- if (reclaim) {
- int i;
+ if (pkt->len_n_flags == cpu_to_le32(FH_RSCSR_FRAME_INVALID))
+ break;
- for (i = 0; i < trans_pcie->n_no_reclaim_cmds; i++) {
- if (trans_pcie->no_reclaim_cmds[i] == pkt->hdr.cmd) {
- reclaim = false;
- break;
+ IWL_DEBUG_RX(trans, "cmd at offset %d: %s (0x%.2x)\n",
+ rxcb._offset,
+ trans_pcie_get_cmd_string(trans_pcie, pkt->hdr.cmd),
+ pkt->hdr.cmd);
+
+ len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
+ len += sizeof(u32); /* account for status word */
+ trace_iwlwifi_dev_rx(trans->dev, pkt, len);
+
+ /* Reclaim a command buffer only if this packet is a response
+ * to a (driver-originated) command.
+ * If the packet (e.g. Rx frame) originated from uCode,
+ * there is no command buffer to reclaim.
+ * Ucode should set SEQ_RX_FRAME bit if ucode-originated,
+ * but apparently a few don't get set; catch them here. */
+ reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME);
+ if (reclaim) {
+ int i;
+
+ for (i = 0; i < trans_pcie->n_no_reclaim_cmds; i++) {
+ if (trans_pcie->no_reclaim_cmds[i] ==
+ pkt->hdr.cmd) {
+ reclaim = false;
+ break;
+ }
}
}
- }
- sequence = le16_to_cpu(pkt->hdr.sequence);
- index = SEQ_TO_INDEX(sequence);
- cmd_index = get_cmd_index(&txq->q, index);
+ sequence = le16_to_cpu(pkt->hdr.sequence);
+ index = SEQ_TO_INDEX(sequence);
+ cmd_index = get_cmd_index(&txq->q, index);
- if (reclaim)
- cmd = txq->cmd[cmd_index];
- else
- cmd = NULL;
+ if (reclaim)
+ cmd = txq->entries[cmd_index].cmd;
+ else
+ cmd = NULL;
- err = iwl_op_mode_rx(trans->op_mode, &rxcb, cmd);
+ err = iwl_op_mode_rx(trans->op_mode, &rxcb, cmd);
- /*
- * XXX: After here, we should always check rxcb._page
- * against NULL before touching it or its virtual
- * memory (pkt). Because some rx_handler might have
- * already taken or freed the pages.
- */
+ /*
+ * After here, we should always check rxcb._page_stolen,
+ * if it is true then one of the handlers took the page.
+ */
- if (reclaim) {
- /* Invoke any callbacks, transfer the buffer to caller,
- * and fire off the (possibly) blocking
- * iwl_trans_send_cmd()
- * as we reclaim the driver command queue */
- if (rxcb._page)
- iwl_tx_cmd_complete(trans, &rxcb, err);
- else
- IWL_WARN(trans, "Claim null rxb?\n");
+ if (reclaim) {
+ /* Invoke any callbacks, transfer the buffer to caller,
+ * and fire off the (possibly) blocking
+ * iwl_trans_send_cmd()
+ * as we reclaim the driver command queue */
+ if (!rxcb._page_stolen)
+ iwl_tx_cmd_complete(trans, &rxcb, err);
+ else
+ IWL_WARN(trans, "Claim null rxb?\n");
+ }
+
+ page_stolen |= rxcb._page_stolen;
+ offset += ALIGN(len, FH_RSCSR_FRAME_ALIGN);
}
- /* page was stolen from us */
- if (rxcb._page == NULL)
+ /* page was stolen from us -- free our reference */
+ if (page_stolen) {
+ __free_pages(rxb->page, trans_pcie->rx_page_order);
rxb->page = NULL;
+ }
/* Reuse the page if possible. For notification packets and
* SKBs that fail to Rx correctly, add them back into the
diff --cc drivers/net/wireless/iwlwifi/iwl-trans.h
index fdf9788,7018d31..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@@ -260,7 -256,8 +256,9 @@@ static inline void iwl_free_resp(struc
struct iwl_rx_cmd_buffer {
struct page *_page;
+ int _offset;
+ bool _page_stolen;
+ unsigned int truesize;
};
static inline void *rxb_addr(struct iwl_rx_cmd_buffer *r)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: strange commits in the drivers-x86 tree
From: Matthew Garrett @ 2012-05-04 0:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20120504101439.edb8133fe986fc4cca94b969@canb.auug.org.au>
On Fri, May 04, 2012 at 10:14:39AM +1000, Stephen Rothwell wrote:
> Hi Matthew,
>
> I have no idea what you have done to your tree, but it now contains scsi,
> nfs and arm commits (at least) that don't appear to be at all relevant to
> x86 drivers ... it looks like you may have rebased part of Linus' tree
> onto yours.
>
> I will use the drivers-x86 tree from next-20120503 for today.
Well that's somewhat bizarre - I did a rebase onto master, git am on a
maildir, then a rebase -i to drop a conflicting commit. I think we're
equally confused here.
--
Matthew Garrett | mjg59@srcf.ucam.org
^ permalink raw reply
* linux-next: failure to fetch samsung and bjdooks-i2c trees
From: Stephen Rothwell @ 2012-05-04 0:27 UTC (permalink / raw)
To: Ben Dooks; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
Hi Ben,
I have been getting:
fatal: unable to connect to git.fluff.org:
git.fluff.org[0: 89.16.178.74]: errno=Connection refused
for the last couple of days ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: strange commits in the drivers-x86 tree
From: Stephen Rothwell @ 2012-05-04 0:14 UTC (permalink / raw)
To: Matthew Garrett; +Cc: linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
Hi Matthew,
I have no idea what you have done to your tree, but it now contains scsi,
nfs and arm commits (at least) that don't appear to be at all relevant to
x86 drivers ... it looks like you may have rebased part of Linus' tree
onto yours.
I will use the drivers-x86 tree from next-20120503 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: inux-next: Tree for Apr 27 (uml + mm/memcontrol.c)
From: Hiroyuki Kamezawa @ 2012-05-03 23:33 UTC (permalink / raw)
To: David Rientjes
Cc: Aneesh Kumar K.V, Andrew Morton, Randy Dunlap, Stephen Rothwell,
linux-next, linux-kernel, Richard Weinberger, KAMEZAWA Hiroyuki
In-Reply-To: <CABEgKgrkQ=asB2WExQb1KTd1MyoWDwJCO2_u2cJC4toEUa3C4g@mail.gmail.com>
On Fri, May 4, 2012 at 8:21 AM, Hiroyuki Kamezawa
<kamezawa.hiroyuki@gmail.com> wrote:
> On Fri, May 4, 2012 at 6:57 AM, David Rientjes <rientjes@google.com> wrote:
>> On Thu, 3 May 2012, David Rientjes wrote:
>> If I add XX:+UseLargePages to the command line to use
>> hugepages it's even larger.
Ah, sorry. I couldn't understand this. Why performance difference gets larger if
usage of anon memory decreases ? I guess overheads are just added to anon page
faults and file cache handling. If you use Hugepage, anon memory overheads will
disappear.
Thanks,
-Kame
^ permalink raw reply
* linux-next: triage for May 3, 2012
From: Paul Gortmaker @ 2012-05-03 23:24 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
New breakage since last report:
ppc:ppc40x_defconfig
ppc4xx_msi.c:178:2: error: right shift count >= width of type
ppc:mpc85xx_defconfig
hugetlbpage.c:316:4: passing arg 7 of 'parse_args' from incompat type
arm:spear3xx_defconfig
spear3xx_clock.c: implicit declaration of function 'clk_register_clkdev'
arm:nhk8815_defconfig
gpio-nomadik.c: 'struct gpio_chip' has no member named 'of_node'
arm:integrator_defconfig
pci_std_swizzle was deleted, I've sent a fix
arm:s3c2410_defconfig
trivial missing header incl. I've sent a fix.
blackfin:SMP
kernel/smp.c:724: undefined reference to `smp_call_function_many'
Randconfig fails that may or may not be new (by their very nature):
<none>
Builds that are fixed since last report:
-USB err stuff fixed
-mmotm HUGE_MAX_HSTATE missing define fixed
-i386 allmodconfig
----------------------
Note1: The randconfig fails are only listed once and not tracked
in the below listing.
Note2: Build fails that are perpetual and/or unlikely to ever
get fixed are not tracked here.
Note3: Issues that Stephen finds and reverts/avoids before kicking
off the all-arch/all-config builds are also not tracked here.
Note4: I'm also not tracking the kallsyms extra pass on ARM on
a per board basis anymore. It has nothing to do with the board.
Why? See: http://marc.info/?l=linux-next&m=133267456809502
----------------------
Latest results at:
http://kisskb.ellerman.id.au/kisskb/branch/9/
Failures as of May 3rd, 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:integrator_defconfig
when: May 3
why: pci_std_swizzle was deleted
status: fix sent to arm kernel ML.
ARM:s3c2410_defconfig
when: May 3
why: s3c2410_wdt.c:517:3: error: implicit declaration of function 'of_match_ptr'
status: fix sent to arm kernel ML.
ARM:nhk8815_defconfig
when: May 3
why: gpio-nomadik.c: 'struct gpio_chip' has no member named 'of_node'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6229016/
ARM:spear3xx_defconfig,spear6xx_defconfig
when: May 3
why: spear3xx_clock.c: implicit declaration of function 'clk_register_clkdev'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6229026/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6229027/
ARM:mackerel_defconfig,ag5evm_defconfig
when: Apr 19 (possibly earlier?)
why: pfc-sh7372.c: undefined reference to `mmc_detect_change'
why: pfc-sh73a0.c: undefined reference to `mmc_detect_change'
status:
fix:
ref: http://article.gmane.org/gmane.linux.ports.sh.devel/14412
ref: http://article.gmane.org/gmane.linux.ports.sh.devel/14413
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131930/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131908/
ARM:bcmring_defconfig
when: Apr 20ish
why: usr/include/asm/kvm_para.h:1: included file 'asm-generic/kvm_para.h' is not exported
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6228994/
ARM:ezx_defconfig
when: Apr 19 (possibly earlier?)
why: ezx-pcap.c: implicit declaration of function 'irq_to_gpio'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131924/
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: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: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
----------------
AVR32:allnoconfig
when: May 26 2010, 20:49
why: at32_map_usart: undefined reference to `atmel_default_console_device'
status:
fix:
ref:
---------------
bfin: 50% of builds
when: Mar 31
why: "Error: pcrel too far BFD_RELOC_BFIN_10" from kernel/time/timekeeping.c
status: unknown, binutils issue?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6087324/
bfin:SMP
when May 1
why: kernel/smp.c:724: undefined reference to `smp_call_function_many'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6228892/
---------------
cris:allyesconfig,allmodconfig
when: Apr 3
why: too many to list here
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035250/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035249/
----------------
i386:allmodconfig
when: Apr 17
why: samples/seccomp/bpf-direct.c:47:2: error: #error Unsupported platform
status: reported
ref: http://marc.info/?l=linux-kernel&m=133471624530782&w=2
----------------
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)
ref: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52598
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884668/
----------------
m32r:m32700ut.smp_defconfig
when: Mar 15
why: No rule to make target `arch/m32r/boot/compressed/vmlinux.bin
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884670/
----------------
mips:ip27_defconfig
when: Apr 18
why: iwlwifi/iwl-core.h: static decl of 'iwl_alloc_traffic_mem' follows non-static
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131791/
mips:allmodconfig
when: Apr 17
why: sound/oss/soundcard.c: 'MAX_DMA_CHANNELS' undeclared
status: one of many fixes mips needs...
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6091660/
----------------
parisc:defconfig
when: Apr 20
why: file 'asm-generic/kvm_para.h' is not exported
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6137786/
parisc:allmodconfig
when: ?
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
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
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
------------------
powerpc:mpc85xx_defconfig
when: May 3
why: powerpc/mm/hugetlbpage.c: passing argument 7 of 'parse_args' from incompatible pointer type
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6243069/
powerpc:ppc40x_defconfig
when: May 3
why: sysdev/ppc4xx_msi.c:178:2: error: right shift count >= width of type
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6243038/
------------------
sparc[64]:allyesconfig,allmodconfig
when: Apr 18
why: usr/include/asm/kvm_para.h: included file 'asm-generic/kvm_para.h' is not exported
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6243021/
sparc:allnoconfig
when: Apr 20ish
why: arch/sparc/mm/init_64.c: unused variable 'paddr' 'node'
why: arch/sparc/mm/init_64.c: 'memblock_nid_range' defined but not used
------------------
s390:allyesconfig,allmodconfig
when: May 3
why: drivers/memory/emif.c:218:2: error: implicit declaration of function 'readl'
status: reported
ref: https://lkml.org/lkml/2012/5/3/478
------------------
tile:defconfig
when: Apr 20ish
why: drivers/pci/pci-sysfs.c:421: undefined reference to `vga_default_device'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6228983/
------------------
xtensa:defconfig
when: Apr 20
why: undefined reference to `_sdata'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6228970/
^ permalink raw reply
* Re: inux-next: Tree for Apr 27 (uml + mm/memcontrol.c)
From: Hiroyuki Kamezawa @ 2012-05-03 23:21 UTC (permalink / raw)
To: David Rientjes
Cc: Aneesh Kumar K.V, Andrew Morton, Randy Dunlap, Stephen Rothwell,
linux-next, linux-kernel, Richard Weinberger, KAMEZAWA Hiroyuki
In-Reply-To: <alpine.DEB.2.00.1205031454400.1631@chino.kir.corp.google.com>
On Fri, May 4, 2012 at 6:57 AM, David Rientjes <rientjes@google.com> wrote:
> On Thu, 3 May 2012, David Rientjes wrote:
>
>> Is this a claim that memory-intensive workloads will have the exact same
>> performance with and without memcg enabled?
>
> I've just run specjbb2005 three times on my system both with and without
> cgroup_disable=memory on the command line and it is consistently 1% faster
> without memcg.
Hm, ok. Where is that overheads from ? Do you have perf output ?
I'll need to check what is bad.
> If I add XX:+UseLargePages to the command line to use
> hugepages it's even larger. So why must I incur this performance
> degradation if I simply want to control who may mmap hugepages out of the
> global pool?
Is that common use case ? If he wants to do some resource control,
common users will limit usual memory, too. That kinds of too much flexibility
makes cgroup complicated, hard-to-use.
Thanks,
-Kame
^ permalink raw reply
* Re: inux-next: Tree for Apr 27 (uml + mm/memcontrol.c)
From: Hiroyuki Kamezawa @ 2012-05-03 23:17 UTC (permalink / raw)
To: David Rientjes
Cc: Aneesh Kumar K.V, Andrew Morton, Randy Dunlap, Stephen Rothwell,
linux-next, linux-kernel, Richard Weinberger, KAMEZAWA Hiroyuki,
Tejun Heo
In-Reply-To: <alpine.DEB.2.00.1205031343300.1631@chino.kir.corp.google.com>
On Fri, May 4, 2012 at 5:56 AM, David Rientjes <rientjes@google.com> wrote:
> On Thu, 3 May 2012, Hiroyuki Kamezawa wrote:
>
>> I think hugetlb should be handled under memcg.
>> 2. The characteristics of hugetlb usage you pointed out is
>> characteristics comes from
>> "current" implementation.
>> Yes, it's now unreclaimable and should be allocated by hands of
>> admin. But,
>> considering recent improvements, memory-defrag, CMA, it can be less
>> hard-to-use thing by updating implementation and on-demand allocation
>> can be allowed.
>>
>
> You're describing transparent hugepages which are already supported by
> memcg specifically because they are transparent.
THP just handles hugepages whose size is equal to pgd size. So, hugetlb
is something more than that, it has various sizes.
> I haven't seen any
> proposals on how to change hugetlb when it comes to preallocation and
> mmaping the memory because it would break the API with userspace.
> Userspace packages like hugeadm are actually used in a wide variety of
> places.
>
I just said if users doesn't need to set sysctl, it's more useful. I got similar
claims from users with IPC max params ;) I answerd set it unlimited...
>> 3. If overhead is the problem, and it's better to disable memcg,
>> Please show numbers with HPC apps. I didn't think memcg has very
>> bad overhead
>> with Bull's presentation in collaboration summit, this April.
>>
>
> Is this a claim that memory-intensive workloads will have the exact same
> performance with and without memcg enabled?
I wrote that I don't get any report that memcg is too slow and need to be fixed.
I think, in general, once memory is allocated, application will run
faster if it never
free memory. So, good application frees memory in batch when it can do. Because
memcg just adds overheads to memory allocation and unmapping, runtime overhead
tend to be small.
My target number when I started to join memcg developments was 2-3% overheads.
> Even if there's the slightest performance degradation, these are what
> users of hugetlb are concerned with already. They use hugetlb for
> performance and it would be a shame for it to regress because you have to
> enable memcg.
>
I think such people don't limit any usages....any kinds of
virtualization/resource controls has 0 overheads.
>> 4. I guess a user who uses hugetlbfs will use usual memory at the same time.
>> Having 2 hierarchy for memory and hugetlb will bring him a confusion.
>>
>
> Cgroups is moving to a single hierarchy for simplification, this isn't the
> only example of where this is currently suboptimal and it would be
> disappointing to solidify hugetlb control as part of memcg because of this
> current limitation that will be addressed by generic cgroups development.
>
> Folks, once these things are merged they become an API that can't easily
> be shifted around and seperated out later. The decision now is either to
> join hugetlb control with memcg forever when they act in very different
> ways or to seperate them so they can be used and configured individually.
How do other guys think ? Tejun ?
Thanks,
-Kame
^ permalink raw reply
* Re: inux-next: Tree for Apr 27 (uml + mm/memcontrol.c)
From: David Rientjes @ 2012-05-03 21:57 UTC (permalink / raw)
To: Hiroyuki Kamezawa
Cc: Aneesh Kumar K.V, Andrew Morton, Randy Dunlap, Stephen Rothwell,
linux-next, linux-kernel, Richard Weinberger, KAMEZAWA Hiroyuki
In-Reply-To: <alpine.DEB.2.00.1205031343300.1631@chino.kir.corp.google.com>
On Thu, 3 May 2012, David Rientjes wrote:
> Is this a claim that memory-intensive workloads will have the exact same
> performance with and without memcg enabled?
I've just run specjbb2005 three times on my system both with and without
cgroup_disable=memory on the command line and it is consistently 1% faster
without memcg. If I add XX:+UseLargePages to the command line to use
hugepages it's even larger. So why must I incur this performance
degradation if I simply want to control who may mmap hugepages out of the
global pool?
The functionality to control this is pretty important if I want to ensure
applications aren't able to infringe on the preallocated hugepages of a
higher priority application for business goals.
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with the input tree
From: Greg KH @ 2012-05-03 21:49 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Dmitry Torokhov, Chris Bagwell
In-Reply-To: <20120503144421.bce525fdec4a9b2d3b7557d5@canb.auug.org.au>
On Thu, May 03, 2012 at 02:44:21PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/input/tablet/wacom_wac.c between commit eb71d1bb270e ("Input:
> wacom - use dev_xxx() instead of naked printk()s and dbg()s") from the
> input tree and commit 3b6aee237e88 ("USB: wacom: remove dbg() usage")
> from the usb tree.
>
> I just used the input tree's version (which used "input->dev.parent"
> instead of "&input->dev").
That's fine, Dmitry and I are still "discussing" which pointer is best
to use on lkml, but either is good for the merge :)
thanks,
greg k-h
^ permalink raw reply
* Re: inux-next: Tree for Apr 27 (uml + mm/memcontrol.c)
From: David Rientjes @ 2012-05-03 20:56 UTC (permalink / raw)
To: Hiroyuki Kamezawa
Cc: Aneesh Kumar K.V, Andrew Morton, Randy Dunlap, Stephen Rothwell,
linux-next, linux-kernel, Richard Weinberger, KAMEZAWA Hiroyuki
In-Reply-To: <CABEgKgqWo=b=o7PwOLc=QqCWXQxUaYvMX99GP9cR_Y-RoTEW3g@mail.gmail.com>
On Thu, 3 May 2012, Hiroyuki Kamezawa wrote:
> I think hugetlb should be handled under memcg.
>
> 1. I think Hugetlb is memory.
>
Agreed, but hugetlb control is done in a very different way than regular
memory in terms of implementation and preallocation. Just because it's
called "memory controller" doesn't mean it must control all types of
memory; hugetlb has always been considered a seperate type of VM that
diverges quite radically from the VM implementation. Forcing users into
an all-or-nothing approach is a lousy solution when its simpler, cleaner,
more extendable, and doesn't lose any functionality when seperated.
> 2. The characteristics of hugetlb usage you pointed out is
> characteristics comes from
> "current" implementation.
> Yes, it's now unreclaimable and should be allocated by hands of
> admin. But,
> considering recent improvements, memory-defrag, CMA, it can be less
> hard-to-use thing by updating implementation and on-demand allocation
> can be allowed.
>
You're describing transparent hugepages which are already supported by
memcg specifically because they are transparent. I haven't seen any
proposals on how to change hugetlb when it comes to preallocation and
mmaping the memory because it would break the API with userspace.
Userspace packages like hugeadm are actually used in a wide variety of
places.
[ I would love to see hugetlb be deprecated entirely and move in a
direction where transparent hugepages can make that happen, but we're
not there yet because we're missing key functionality such as pagecache
support. ]
> 3. If overhead is the problem, and it's better to disable memcg,
> Please show numbers with HPC apps. I didn't think memcg has very
> bad overhead
> with Bull's presentation in collaboration summit, this April.
>
Is this a claim that memory-intensive workloads will have the exact same
performance with and without memcg enabled? That would be quite an
amazing feat, I agree, since tracking user pages would have absolutely
zero cost. Please clarify your answer here and whether memcg is not
expected to cause even the slightest performance degradation on any
workload, I want to make sure I'm understanding it correctly. I'll follow
up after that.
Even if there's the slightest performance degradation, these are what
users of hugetlb are concerned with already. They use hugetlb for
performance and it would be a shame for it to regress because you have to
enable memcg.
> 4. I guess a user who uses hugetlbfs will use usual memory at the same time.
> Having 2 hierarchy for memory and hugetlb will bring him a confusion.
>
Cgroups is moving to a single hierarchy for simplification, this isn't the
only example of where this is currently suboptimal and it would be
disappointing to solidify hugetlb control as part of memcg because of this
current limitation that will be addressed by generic cgroups development.
Folks, once these things are merged they become an API that can't easily
be shifted around and seperated out later. The decision now is either to
join hugetlb control with memcg forever when they act in very different
ways or to seperate them so they can be used and configured individually.
^ permalink raw reply
* Re: inux-next: Tree for Apr 27 (uml + mm/memcontrol.c)
From: David Rientjes @ 2012-05-03 20:39 UTC (permalink / raw)
To: Aneesh Kumar K.V
Cc: Andrew Morton, Randy Dunlap, Stephen Rothwell, linux-next,
linux-kernel, Richard Weinberger, KAMEZAWA Hiroyuki
In-Reply-To: <87ehr1xtdz.fsf@skywalker.in.ibm.com>
On Thu, 3 May 2012, Aneesh Kumar K.V wrote:
> All the use cases I came across requested for limiting both memory
> and hugetlb pages. They want to limit the usage of both.
And as cgroups moves to a single hierarchy for simplification, this isn't
hard to do by mounting both cgroups.
^ permalink raw reply
* Re: inux-next: Tree for Apr 27 (uml + mm/memcontrol.c)
From: Aneesh Kumar K.V @ 2012-05-03 13:54 UTC (permalink / raw)
To: David Rientjes
Cc: Andrew Morton, Randy Dunlap, Stephen Rothwell, linux-next,
linux-kernel, Richard Weinberger, KAMEZAWA Hiroyuki
In-Reply-To: <alpine.DEB.2.00.1205030208120.21476@chino.kir.corp.google.com>
David Rientjes <rientjes@google.com> writes:
>> My first version was to do it as a seperate controller
>>
>> http://thread.gmane.org/gmane.linux.kernel.mm/73826
>>
>> But the feedback I received was to do it as a part of memcg extension,
>> because what the controller is limiting is memory albeit a different
>> type. AFAIU there is also this goal of avoiding controller proliferation.
>>
>
> Maybe Kame can speak up if he feels strongly about this, but I really
> think it should be its own controller in its own file (which would
> obviously make this discussion irrelevant since mm/hugetlbcg.c would be
> dependent on your own config symbol). I don't feel like this is the same
> as kmem since its not a global resource like hugetlb pages are.
> Hugetlb pages can either be allocated statically on the command line at
> boot or dynamically via sysfs and they are globally available to whoever
> mmaps them through hugetlbfs. I see a real benefit from being able to
> limit the number of hugepages in the global pool to a set of tasks so they
> can't overuse what has been statically or dynamically allocated. And that
> ability should be available, in my opinion, without having to enable
> memcg, the page_cgroup metadata overhead that comes along with it, and the
> performance impact in using it. I also think it would be wise to seperate
> it out into its own file at the source level so things like this don't
> arise in the future.
All the use cases I came across requested for limiting both memory
and hugetlb pages. They want to limit the usage of both. So for the use case
I am looking at memcg will already be enabled.
-aneesh
^ permalink raw reply
* Re: [PATCH -next] wireless: TI wlxxx depends on MAC80211
From: Luciano Coelho @ 2012-05-03 12:55 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next-u79uwXL29TY76Z2rM5mHXA, LKML,
Andrew Morton, linux-wireless-u79uwXL29TY76Z2rM5mHXA,
John W. Linville
In-Reply-To: <4F8C784B.2040402-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
On Mon, 2012-04-16 at 12:51 -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
>
> wl12xx build fails with many undefined symbol errors when MAC80211
> and CFG80211 are not enabled, so make WLCORE and WL12XX depend
> on MAC80211 (which already depends on CFG80211).
>
> Here are a few of the many build errors:
>
> drivers/built-in.o: In function `wl1271_register_hw':
> main.c:(.text+0x4197cd): undefined reference to `ieee80211_register_hw'
> drivers/built-in.o: In function `wl1271_rx_streaming_timer':
> main.c:(.text+0x419818): undefined reference to `ieee80211_queue_work'
> drivers/built-in.o: In function `wl1271_flush_deferred_work':
> main.c:(.text+0x419910): undefined reference to `ieee80211_rx'
> main.c:(.text+0x419938): undefined reference to `ieee80211_tx_status'
> drivers/built-in.o: In function `wl12xx_op_channel_switch':
> main.c:(.text+0x419afc): undefined reference to `ieee80211_chswitch_done'
> drivers/built-in.o: In function `wl1271_ssid_set':
> drivers/built-in.o: In function `wl1271_event_process':
> event.c:(.text+0x41fec4): undefined reference to `ieee80211_sched_scan_stopped'
> event.c:(.text+0x41ff88): undefined reference to `ieee80211_cqm_rssi_notify'
> event.c:(.text+0x42000d): undefined reference to `ieee80211_stop_rx_ba_session'
> event.c:(.text+0x420048): undefined reference to `ieee80211_stop_rx_ba_session'
> event.c:(.text+0x4200b8): undefined reference to `ieee80211_chswitch_done'
> event.c:(.text+0x4201ae): undefined reference to `ieee80211_find_sta'
> event.c:(.text+0x4201ba): undefined reference to `ieee80211_report_low_ack'
> event.c:(.text+0x42021b): undefined reference to `ieee80211_connection_loss'
> drivers/built-in.o: In function `wl1271_tx_complete_packet':
> tx.c:(.text+0x4206a6): undefined reference to `ieee80211_get_hdrlen_from_skb'
> drivers/built-in.o: In function `wl1271_tx_fill_hdr':
> tx.c:(.text+0x4208ca): undefined reference to `ieee80211_hdrlen'
> drivers/built-in.o: In function `wl1271_handle_tx_low_watermark':
> (.text+0x420e25): undefined reference to `ieee80211_wake_queue'
> drivers/built-in.o: In function `wl12xx_rearm_rx_streaming':
> (.text+0x420ed9): undefined reference to `ieee80211_queue_work'
> drivers/built-in.o: In function `wl1271_tx_work_locked':
> (.text+0x421008): undefined reference to `ieee80211_free_txskb'
> drivers/built-in.o: In function `wl1271_rx_status.clone.2':
> rx.c:(.text+0x421593): undefined reference to `ieee80211_channel_to_frequency'
> drivers/built-in.o: In function `wl1271_ps_filter_frames':
> ps.c:(.text+0x421a41): undefined reference to `ieee80211_tx_status'
>
> Signed-off-by: Randy Dunlap <rdunlap-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
> Cc: Luciano Coelho <coelho-l0cyMroinI0@public.gmane.org>
> Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
> ---
Applied! Thanks Randy, and sorry for the delay in pushing this through
my tree.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: inux-next: Tree for Apr 27 (uml + mm/memcontrol.c)
From: Hiroyuki Kamezawa @ 2012-05-03 10:30 UTC (permalink / raw)
To: David Rientjes
Cc: Aneesh Kumar K.V, Andrew Morton, Randy Dunlap, Stephen Rothwell,
linux-next, linux-kernel, Richard Weinberger, KAMEZAWA Hiroyuki
In-Reply-To: <alpine.DEB.2.00.1205030208120.21476@chino.kir.corp.google.com>
On Thu, May 3, 2012 at 6:13 PM, David Rientjes <rientjes@google.com> wrote:
> On Sat, 28 Apr 2012, Aneesh Kumar K.V wrote:
>
>> My first version was to do it as a seperate controller
>>
>> http://thread.gmane.org/gmane.linux.kernel.mm/73826
>>
>> But the feedback I received was to do it as a part of memcg extension,
>> because what the controller is limiting is memory albeit a different
>> type. AFAIU there is also this goal of avoiding controller proliferation.
>>
>
> Maybe Kame can speak up if he feels strongly about this, but I really
> think it should be its own controller in its own file (which would
> obviously make this discussion irrelevant since mm/hugetlbcg.c would be
> dependent on your own config symbol). I don't feel like this is the same
> as kmem since its not a global resource like hugetlb pages are.
>
> Hugetlb pages can either be allocated statically on the command line at
> boot or dynamically via sysfs and they are globally available to whoever
> mmaps them through hugetlbfs. I see a real benefit from being able to
> limit the number of hugepages in the global pool to a set of tasks so they
> can't overuse what has been statically or dynamically allocated. And that
> ability should be available, in my opinion, without having to enable
> memcg, the page_cgroup metadata overhead that comes along with it, and the
> performance impact in using it. I also think it would be wise to seperate
> it out into its own file at the source level so things like this don't
> arise in the future.
>
> What do you think? Kame?
I think hugetlb should be handled under memcg.
1. I think Hugetlb is memory.
2. The characteristics of hugetlb usage you pointed out is
characteristics comes from
"current" implementation.
Yes, it's now unreclaimable and should be allocated by hands of
admin. But,
considering recent improvements, memory-defrag, CMA, it can be less
hard-to-use thing by updating implementation and on-demand allocation
can be allowed.
3. If overhead is the problem, and it's better to disable memcg,
Please show numbers with HPC apps. I didn't think memcg has very
bad overhead
with Bull's presentation in collaboration summit, this April.
4. I guess a user who uses hugetlbfs will use usual memory at the same time.
Having 2 hierarchy for memory and hugetlb will bring him a confusion.
Thanks,
-Kame
^ permalink raw reply
* Re: inux-next: Tree for Apr 27 (uml + mm/memcontrol.c)
From: David Rientjes @ 2012-05-03 9:13 UTC (permalink / raw)
To: Aneesh Kumar K.V
Cc: Andrew Morton, Randy Dunlap, Stephen Rothwell, linux-next,
linux-kernel, Richard Weinberger, KAMEZAWA Hiroyuki
In-Reply-To: <87fwbnag6u.fsf@skywalker.in.ibm.com>
On Sat, 28 Apr 2012, Aneesh Kumar K.V wrote:
> My first version was to do it as a seperate controller
>
> http://thread.gmane.org/gmane.linux.kernel.mm/73826
>
> But the feedback I received was to do it as a part of memcg extension,
> because what the controller is limiting is memory albeit a different
> type. AFAIU there is also this goal of avoiding controller proliferation.
>
Maybe Kame can speak up if he feels strongly about this, but I really
think it should be its own controller in its own file (which would
obviously make this discussion irrelevant since mm/hugetlbcg.c would be
dependent on your own config symbol). I don't feel like this is the same
as kmem since its not a global resource like hugetlb pages are.
Hugetlb pages can either be allocated statically on the command line at
boot or dynamically via sysfs and they are globally available to whoever
mmaps them through hugetlbfs. I see a real benefit from being able to
limit the number of hugepages in the global pool to a set of tasks so they
can't overuse what has been statically or dynamically allocated. And that
ability should be available, in my opinion, without having to enable
memcg, the page_cgroup metadata overhead that comes along with it, and the
performance impact in using it. I also think it would be wise to seperate
it out into its own file at the source level so things like this don't
arise in the future.
What do you think? Kame?
^ permalink raw reply
* linux-next: Tree for May 3
From: Stephen Rothwell @ 2012-05-03 6:38 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 43432 bytes --]
Hi all,
Changes since 20120501:
The net-next tree gained a build failure for which I reverted a commit.
The wireless-next tree lost its conflicts but gained another against the
net-next tree.
The mfd tree lost its conflict.
The drm tree lost its conflict but gained another against Linus' tree.
The kvm-ppc tree lost its build failure.
The driver-core tree lost its build failure and conflict.
The usb tree gained conflicts against the usb.current and input trees.
The staging tree lost a conflict.
The arm-soc tree gained conflicts against the arm tree.
The akpm tree gained a conflict against the driver-core 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 189 trees (counting Linus' and 27 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 (ac001e7 Merge tag 'usb-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
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 (77ee3c14 ARM: 7410/1: Add extra clobber registers for assembly in kernel_execve)
Merging ep93xx-current/ep93xx-fixes (2b3c83e dmaengine/ep93xx_dma: Implement double buffering for M2M DMA channels)
Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices)
Merging powerpc-merge/merge (810b4de tty/serial/pmac_zilog: Fix "nobody cared" IRQ message)
Merging sparc/master (e9a5ea1 sparc32,leon: add notify_cpu_starting())
Merging net/master (076e777 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem)
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 (9d1ceac Revert "ath9k_hw: Fix incorrect spur_freq_sd for AR9003")
Merging driver-core.current/driver-core-linus (69964ea Linux 3.4-rc5)
Merging tty.current/tty-linus (84f904e vt: Fix deadlock on scroll-lock)
Merging usb.current/usb-linus (04c235c USB: ehci-tegra: remove redundant gpio_set_value)
Merging staging.current/staging-linus (69964ea Linux 3.4-rc5)
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 (30b8aa9 md: fix possible corruption of array metadata on shutdown.)
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 (3c3c801 Merge branch 'sh/urgent' into sh-fixes-for-linus)
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 (2431a81 spi/spi-bfin5xx: Fix flush of last bit after each spi transfer)
Merging gpio-current/gpio/merge (9a5c7d6 gpio/exynos: Fix compiler warning in gpio-samsung.c file)
Merging arm/for-next (4ec17e7 Merge branches 'amba', 'clkdev', 'fixes', 'mach-types', 'misc', 'mmci' and 'pci' 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 (de12e47 Merge branch 'next/board-samsung' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (431e69e blackfin: asm: fix blackfin.h broken)
Merging c6x/for-linux-next (18d1470 C6X: change main arch kbuild symbol)
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 (c663600 m68k: Correct the Atari ALLOWINT definition)
Merging m68knommu/for-next (a964727 m68knommu: simplify the ColdFire 5407 GPIO struct setup)
Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o)
Merging mips/mips-for-linux-next (d3e4edd Merge branches 'fixes-for-linus', 'module.h-fixes', 'next/ath79' and 'next/lantiq' 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 (ec34a68 powerpc: Remove old powerpc specific ptrace getregs/setregs calls)
Merging 4xx/next (9c6b235 powerpc/44x: Add PCI MSI node for Maui APM821xx SoC and Bluestone board in DTS)
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 (799d40c sparc64: Do not set max_mapnr.)
Merging tile/master (5e4ce7a 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 (2c5baa1 cifs: make sure we ignore the credentials= and cred= options)
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 (f1d470b ext4: add metadata checksumming to the list of supported features)
Merging fuse/for-next (519c604 fuse: optimize fallocate on permanent failure)
Merging gfs2/master (c0752aa GFS2: eliminate log elements and simplify)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (abb5c24 Merge branch 'nfs-for-next' into linux-next)
Merging nfsd/nfsd-next (6278aae nfsd: add IPv6 addr escaping to fs_location hosts)
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 (65b3219 UBIFS: remove xattr Kconnfig option)
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 (df558de PCI: work around IvyBridge internal graphics FLR erratum)
Merging hid/for-next (e577426 Merge branch 'device-groups' 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 (e357d03 i2c: muxes: rename first set of drivers to a standard pattern)
Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (d63b478 hwmon: (ad7314) Remove unused defines, and rename OFFSET to SHIFT)
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 (0109487 Merge branch 'lockdep' into for-next)
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 (66f75a5 Linux 3.4-rc4)
Merging dlm/next (1a058f5 gfs2: fix recovery during unmount)
Merging scsi/for-next (b965030 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 (56cbb3d Merge branch 'fixes' into next)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (e4ae004 netem: add ECN capability)
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/e1000e/param.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be.h
Merging wireless-next/master (0a9b378 {nl,cfg,mac}80211: Allow user to see/configure HT protection mode)
CONFLICT (content): Merge conflict in net/wireless/nl80211.c
Merging bluetooth/master (6bed2e7 bluetooth: Add support for Foxconn/Hon Hai AR5BBU22 0489:E03C)
Merging mtd/master (7b0e67f mtd: docg3 add protection against concurrency)
Merging l2-mtd/master (abebda7 mtd: mips: lantiq: add xway nand support)
Merging crypto/master (945478a hwrng: omap - use devm_request_and_ioremap)
Merging sound/for-next (dbc3096 Merge branch 'topic/misc' into for-next)
Merging sound-asoc/for-next (8eacef3 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/smp.c
CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c
Merging input/next (2872a9b Input: evdev - properly handle read/write with count 0)
Merging input-mt/for-next (66f75a5 Linux 3.4-rc4)
Merging cgroup/for-next (0d4dde1 res_counter: Account max_usage when calling res_counter_charge_nofail())
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging block/for-next (d634e66 Merge branch 'for-3.5/core' into for-next)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging quilt/device-mapper (27fd946 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 (6ebaf8f mmc: sdhci-spear: Use devm_* derivatives)
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 (732f027 MD RAID1: Further conditionalize 'fullsync')
Merging mfd/for-next (6ef9418 mfd: Add parameter to disable ab8500 battery management)
Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling)
Merging drm/drm-next (1aa1b11 drm/kms: reduce some messages to debug level (v2))
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Merging fbdev/fbdev-next (3499b1d Merge branch 'fixes' of git://linuxtv.org/pinchartl/fbdev into fbdev-next)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (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 (43412c01 watchdog: watchdog_dev: include private header to pickup global symbol prototypes)
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 (15ed103 edac: Fix spelling errors.)
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 (f9b4958 PM / Documentation: suspend-and-cpuhotplug.txt: Fix typo)
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 (dc71c17 Merge branch 'timers/urgent')
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging rcu/rcu/next (6c9f82e Merge branches 'barrier.2012.05.01a', 'fixes.2012.04.26a', 'inline.2012.04.25a' and 'srcu.2012.04.30a' into HEAD)
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 (b6ddf05 KVM: x86: Run PIT work in own kthread)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging kvm-ppc/kvm-ppc-next (44c42f7 kvm/book3s: Make kernel emulated H_PUT_TCE available for "PR" KVM)
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
Merging xen-two/linux-next (cbcc4ca Merge branch 'stable/for-linus-3.5' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (6c41792 percpu, x86: don't use PMD_SIZE as embedded atom_size on 32bit)
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 (56ef671 Merge branches 'regmap-core' and 'regmap-stride' into regmap-next)
CONFLICT (content): Merge conflict in drivers/base/regmap/regmap.c
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (2878bda Extcon: fix section mismatch in extcon_gpio.c)
Merging tty/tty-next (f73fa05 serial8250: Introduce serial8250_register_8250_port())
Merging usb/usb-next (3244560 usb: cp210x: Corrected USB request type definitions)
CONFLICT (content): Merge conflict in drivers/usb/host/ehci-tegra.c
CONFLICT (modify/delete): drivers/usb/core/inode.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/core/inode.c left in tree.
CONFLICT (content): Merge conflict in drivers/input/tablet/wacom_wac.c
$ git rm -f drivers/usb/core/inode.c
Merging staging/staging-next (61cd983 Staging: Comedi adv_pci1710 : Corrected over 80 column warnings)
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
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in drivers/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 (4cd9069 fs: remove 8 bytes of padding from struct writeback_control on 64 bit builds)
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 (1772311 pinctrl: add pinctrl-mxs support)
CONFLICT (content): Merge conflict in drivers/pinctrl/core.c
CONFLICT (content): Merge conflict in Documentation/driver-model/devres.txt
Merging tegra/for-next (2942a7e 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 (53ffd22 virtio-net: remove useless disable on freeze)
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 (6f1f0d2 Merge branch 'next/dt' into for-next)
CONFLICT (content): Merge conflict in lib/Makefile
CONFLICT (modify/delete): drivers/mfd/ab5500-core.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/mfd/ab5500-core.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-lpc32xx/common.c
CONFLICT (modify/delete): arch/arm/mach-ixp23xx/roadrunner.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/roadrunner.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp23xx/pci.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/pci.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp23xx/ixdp2351.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/ixdp2351.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp23xx/include/mach/platform.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/include/mach/platform.h left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/pci.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/pci.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/ixdp2x01.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/ixdp2x01.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/ixdp2800.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/ixdp2800.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/ixdp2400.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/ixdp2400.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/include/mach/platform.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/include/mach/platform.h left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/enp2611.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/enp2611.c left in tree.
$ git rm -f drivers/mfd/ab5500-core.c
$ git rm -f -r arch/arm/mach-ixp2000 arch/arm/mach-ixp23xx
Merging ep93xx/ep93xx-cleanup (a1eacd7 arm: ep93xx: use gpio_led_register_device)
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 (69964ea Linux 3.4-rc5)
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: pagemap.h: fix warning about possibly used before init var
Applying: drivers/gpu/drm/gma500/mdfld_device.c: fix build
Applying: proc/pid/pagemap: correctly report non-present ptes and holes between vmas
Applying: mm: fix division by 0 in percpu_pagelist_fraction()
Applying: hugetlb: prevent BUG_ON in hugetlb_fault() -> hugetlb_cow()
Applying: namespaces, pid_ns: fix leakage on fork() failure
Applying: memcg: free spare array to avoid memory leak
Applying: drivers/leds: correct __devexit annotations
Applying: umem: fix up unplugging
Applying: arch/x86/platform/geode/net5501.c: change active_low to 0 for LED driver
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: 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: cpuidle: add checks to avoid NULL pointer dereference
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: 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: drivers/thermal/spear_thermal.c: add Device Tree probing capability
Applying: unicore32: use block_sigmask()
Applying: connector/userns: replace netlink uses of cap_raised with capable.
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: drivers/scsi/ufs: reverse the ufshcd_is_device_present logic
Applying: drivers/scsi/ufs: fix evaluation of task_failed status
Applying: drivers/scsi/ufs: fix incorrect return value about SUCCESS and FAILED
Applying: drivers/scsi/atp870u.c: fix bad use of udelay
Applying: vfs: increment iversion when a file is truncated
Applying: fs: 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: remove swap token code
Applying: mm: vmscan: remove lumpy reclaim
Applying: mm: vmscan: do not stall on writeback during memory compaction
Applying: mm: vmscan: remove reclaim_mode_t
Applying: hugetlb: rename max_hstate to hugetlb_max_hstate
Applying: hugetlbfs: don't use ERR_PTR with VM_FAULT* values
Applying: hugetlbfs: add an inline helper for finding hstate index
Applying: hugetlb: use mmu_gather instead of a temporary linked list for accumulating pages
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2
Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb
Applying: hugetlb: simplify migrate_huge_page()
Applying: memcg: add HugeTLB extension
Applying: memcg-add-hugetlb-extension-fix
Applying: memcg-add-hugetlb-extension-fix-fix
Applying: hugetlb: add charge/uncharge calls for HugeTLB alloc/free
Applying: memcg: track resource index in cftype private
Applying: hugetlbfs: add memcg control files for hugetlbfs
Applying: memcg: use scnprintf instead of sprintf
Applying: hugetlbfs-add-memcg-control-files-for-hugetlbfs-use-scnprintf-instead-of-sprintf-fix
Applying: hugetlbfs: add a list for tracking in-use HugeTLB pages
Applying: memcg: move HugeTLB resource count to parent cgroup on memcg removal
Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix
Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix-fix
Applying: hugetlb: migrate memcg info from oldpage to new page during migration
Applying: hugetlb-migrate-memcg-info-from-oldpage-to-new-page-during-migration-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2
Applying: memcg: add memory controller documentation for hugetlb management
Applying: mm: fix off-by-one bug in print_nodes_state()
Applying: mm: use kcalloc() instead of kzalloc() to allocate array
Applying: mm/mmap.c: find_vma(): remove unnecessary if(mm) check
Applying: mm-mmapc-find_vma-remove-unnecessary-ifmm-check-fix
Applying: mm/fork: fix overflow in vma length when copying mmap on clone
Applying: mm/vmstat.c: remov debug fs entries on failure of file creation and made extfrag_debug_root dentry local
Applying: mm: correctly synchronize rss-counters at exit/exec
Applying: thp, memcg: split hugepage for memcg oom on cow
Applying: mm: do_migrate_pages() calls migrate_to_node() even if task is already on a correct node
Applying: mm-do_migrate_pages-calls-migrate_to_node-even-if-task-is-already-on-a-correct-node-fix
Applying: mm: do_migrate_pages(): rename arguments
Applying: kernel: cgroup: push rcu read locking from css_is_ancestor() to callsite
Applying: mm: memcg: count pte references from every member of the reclaimed hierarchy
Applying: mm-memcg-count-pte-references-from-every-member-of-the-reclaimed-hierarchy-fix
Applying: mm: rename is_mlocked_vma() to mlocked_vma_newpage()
Applying: mm-rename-is_mlocked_vma-to-mlocked_vma_newpage-fix
Applying: mm, thp: drop page_table_lock to uncharge memcg pages
Applying: Documentation: memcg: future proof hierarchical statistics documentation
Applying: Cross Memory Attach: make it Kconfigurable
Applying: bug: introduce BUILD_BUG_ON_INVALID() macro
Applying: bug: completely remove code generated by disabled VM_BUG_ON()
Applying: x86: print e820 physical addresses consistently with other parts of kernel
Applying: x86: print physical addresses consistently with other parts of kernel
Applying: swiotlb: print physical addresses consistently with other parts of kernel
Applying: mm: print physical addresses consistently with other parts of kernel
Applying: kbuild: install kernel-page-flags.h
Applying: tools/vm/page-types.c: cleanups
Applying: mm: move is_vma_temporary_stack() declaration to huge_mm.h
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: memcg: add mlock statistic in memory.stat
Applying: memcg-add-mlock-statistic-in-memorystat-fix
Applying: mm/vmscan: store "priority" in struct scan_control
Applying: mm: add link from struct lruvec to struct zone
Applying: mm/vmscan: push lruvec pointer into isolate_lru_pages()
Applying: mm/vmscan: push zone pointer into shrink_page_list()
Applying: mm/vmscan: remove update_isolated_counts()
Applying: mm/vmscan: push lruvec pointer into putback_inactive_pages()
Applying: mm/vmscan: replace zone_nr_lru_pages() with get_lruvec_size()
Applying: mm/vmscan: push lruvec pointer into inactive_list_is_low()
Applying: mm/vmscan: push lruvec pointer into shrink_list()
Applying: mm/vmscan: push lruvec pointer into get_scan_count()
Applying: mm/vmscan: push lruvec pointer into should_continue_reclaim()
Applying: mm/vmscan: kill struct mem_cgroup_zone
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: CodingStyle: add kmalloc_array() to memory allocators
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: introduce SIZE_MAX
Applying: sethostname/setdomainname: notify userspace when there is a change in uts_kern_table
Applying: NMI watchdog: fix for lockup detector breakage on resume
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix
Applying: watchdog: fix for lockup detector breakage on resume
Applying: task_work_add: generic process-context callbacks
Applying: genirq: reimplement exit_irq_thread() hook via task_work_add()
Applying: hexagon: do_notify_resume() needs tracehook_notify_resume()
Applying: keys: change keyctl_session_to_parent() to use task_work_add()
Applying: keys: kill the dummy key_replace_session_keyring()
Applying: keys: kill task_struct->replacement_session_keyring
Applying: kernel/irq/manage.c: use the pr_foo() infrastructure to prefix printks
Applying: vsprintf: correctly handle width when '#' flag used in %#p format.
Applying: vsprintf-correctly-handle-width-when-flag-used-in-%p-format-checkpatch-fixes
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: lcd: add callbacks for early fb event blank support
Applying: fbdev: add events for early fb event support
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: lm3556: don't call kfree for the memory allocated by devm_kzalloc
Applying: leds: simple_strtoul() cleanup
Applying: leds: Use kcalloc instead of kzalloc to allocate array
Applying: leds: add new field to led_classdev struct to save activation state
Applying: leds: change existing triggers to use activated flag
Applying: leds: change ledtrig-timer to use activated flag
Applying: include/linux/led-lm3530.h: comment correction about the range of brightness
Applying: drivers/leds/leds-lm3530.c: simplify als configuration on initialization
Applying: leds: heartbeat: stop on shutdown
Applying: leds-heartbeat-stop-on-shutdown-v5
Applying: leds-heartbeat-stop-on-shutdown-checkpatch-fixes
Applying: leds: add new transient trigger for one shot timer activation
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: lib/string_helpers.c: make arrays static
Applying: lib/bitmap.c: fix documentation for scnprintf() functions
Applying: vsprintf: fix %ps on non symbols when using kallsyms
Applying: spinlock_debug: print kallsyms name for lock
Applying: radix-tree: fix preload vector size
Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
Applying: init: disable sparse checking of the mount.o source files
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: rtc: ds1307: remove superfluous initialization
Applying: rtc: ds1307: add trickle charger support
Applying: drivers/rtc/rtc-m41t93.c: don't let get_time() reset M41T93_FLAG_OF
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.c: fix kernel-doc warning
Applying: kmod: avoid deadlock from recursive kmod call
Applying: cred: remove task_is_dead() from __task_cred() validation
Applying: stack usage: add pid to warning printk in check_stack_usage
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: don't do dummy rcu_read_lock/rcu_read_unlock on error path
Applying: proc: pass "fd" by value in /proc/*/{fd,fdinfo} code
Applying: procfs: use more apprioriate types when dumping /proc/N/stat
Applying: proc: report file/anon bit in /proc/pid/pagemap
Applying: proc/smaps: carefully handle migration entries
Applying: proc/smaps: show amount of nonlinear ptes in vma
Applying: proc/smaps: show amount of hwpoison pages
Applying: proc: use IS_ERR_OR_NULL()
Applying: fork: call complete_vfork_done() after clearing child_tid and flushing rss-counters
Applying: cpu: introduce clear_tasks_mm_cpumask() helper
Applying: arm: use clear_tasks_mm_cpumask()
Applying: powerpc: use clear_tasks_mm_cpumask()
Applying: sh: use clear_tasks_mm_cpumask()
Applying: blackfin: a couple of task->mm handling fixes
Applying: blackfin: fix possible deadlock in decode_address()
Applying: um: should hold tasklist_lock while traversing processes
Applying: um: fix possible race on task->mm
Applying: um: properly check all process' threads for a live mm
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: ipc/mqueue: cleanup definition names and locations
Applying: ipc/mqueue: switch back to using non-max values on create
Applying: ipc/mqueue: enforce hard limits
Applying: ipc/mqueue: update maximums for the mqueue subsystem
Applying: ipc/mqueue: using vmalloc requires including vmalloc.h
Applying: mqueue: revert bump up DFLT_*MAX
Applying: mqueue: don't use kmalloc with KMALLOC_MAX_SIZE
Applying: mqueue: separate mqueue default value from maximum value
Applying: selftests: add mq_open_tests
Applying: ipc/mqueue: improve performance of send/recv
Applying: ipc-mqueue-improve-performance-of-send-recv-fix
Applying: ipc/mqueue: correct mq_attr_ok test
Applying: ipc-mqueue-correct-mq_attr_ok-test-fix
Applying: ipc/mqueue: strengthen checks on mqueue creation
Applying: ipc-mqueue-strengthen-checks-on-mqueue-creation-fix
Applying: tools/selftests: add mq_perf_tests
Applying: tools-selftests-add-mq_perf_tests-checkpatch-fixes
Applying: rapidio: add DMA engine support for RIO data transfers
Applying: rapidio/tsi721: add DMA engine support
Applying: eventfd: change int to __u64 in eventfd_signal()
Applying: eventfd-change-int-to-__u64-in-eventfd_signal-fix
Applying: w1: introduce a slave mutex for serializing IO
Applying: aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: c/r: fs, proc: Move children entry back to tid_base_stuff
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: simplify PR_SET_MM on mm::code/data assignment
Applying: c-r-prctl-simplify-pr_set_mm-on-mm-code-data-assignment-fix
Applying: c/r: prctl: return -EFAULT instead of -EINVAL in case if underlied VMA is not found
Applying: c/r: prctl: add ability to set new mm_struct::exe_file
Applying: c/r: prctl: update prctl_set_mm_exe_file() after mm->num_exe_file_vmas removal
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: c/r: prctl: drop VMA flags test on PR_SET_MM_ stack data assignment
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: kconfig: update compression algorithm info
Applying: notify_change(): check that i_mutex is held
Merging akpm (dfdb227 notify_change(): check that i_mutex is held)
[master fe58c06] Revert "net: add a prefetch in socket backlog processing"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (net-next tree related)
From: David Miller @ 2012-05-03 6:26 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel, edumazet
In-Reply-To: <20120503161623.ad219e088031fd66be212407@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 May 2012 16:16:23 +1000
> After merging the final tree, today's linux-next build (sparc32 defconfig)
> failed like this:
>
> net/core/sock.c: In function '__release_sock':
> net/core/sock.c:1703:4: error: implicit declaration of function 'prefetch' [-Werror=implicit-function-declaration]
>
> Caused by commit e4cbb02a1070 ("net: add a prefetch in socket backlog
> processing").
>
> I have reverted that commit for today.
Fixed as follows:
--------------------
net: Add missing linux/prefetch.h include to net/core/sock.c
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/core/sock.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/core/sock.c b/net/core/sock.c
index 1a88351..b8c818e 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -113,6 +113,7 @@
#include <linux/user_namespace.h>
#include <linux/static_key.h>
#include <linux/memcontrol.h>
+#include <linux/prefetch.h>
#include <asm/uaccess.h>
--
1.7.10
^ permalink raw reply related
* linux-next: build failure after merge of the final tree (net-next tree related)
From: Stephen Rothwell @ 2012-05-03 6:16 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Eric Dumazet
[-- Attachment #1: Type: text/plain, Size: 474 bytes --]
Hi all,
After merging the final tree, today's linux-next build (sparc32 defconfig)
failed like this:
net/core/sock.c: In function '__release_sock':
net/core/sock.c:1703:4: error: implicit declaration of function 'prefetch' [-Werror=implicit-function-declaration]
Caused by commit e4cbb02a1070 ("net: add a prefetch in socket backlog
processing").
I have reverted that commit 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 akpm tree with the driver-core tree
From: Stephen Rothwell @ 2012-05-03 5:53 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Randy Dunlap, Greg KH
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/w1/slaves/Kconfig between commit c0a6720977f8 ("Revert "w1: Add
1-wire slave device driver for DS28E04-100"") from the driver-core tree
and commit "w1: fix ds28e04 build, select CRC16" from the akpm tree.
The former removes the text that the latter is fixing, so I just dropped
this patch from the akpm tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* drivers/watchdog/s3c2410_wdt patch is missing an include
From: Wim Van Sebroeck @ 2012-05-03 5:03 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
Hi Stephen,
Just a quick e-mail to let you know that the below patch is missing an:
#include <linux/of.h>
I will fix this in my tree today.
Sorry,
Wim.
---
commit 4c1134cc961f825370dd9f84ce0169bd0ed97957
Author: Wim Van Sebroeck <wim@iguana.be>
Date: Wed May 2 14:42:22 2012 +0200
watchdog: s3c2410-wdt: Use of_match_ptr().
Use of_match_ptr definition for the of_match_table.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 04e5a6d..686c8fc 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -503,8 +503,6 @@ static const struct of_device_id s3c2410_wdt_match[] = {
{},
};
MODULE_DEVICE_TABLE(of, s3c2410_wdt_match);
-#else
-#define s3c2410_wdt_match NULL
#endif
static struct platform_driver s3c2410wdt_driver = {
@@ -516,7 +514,7 @@ static struct platform_driver s3c2410wdt_driver = {
.driver = {
.owner = THIS_MODULE,
.name = "s3c2410-wdt",
- .of_match_table = s3c2410_wdt_match,
+ .of_match_table = of_match_ptr(s3c2410_wdt_match),
},
};
^ permalink raw reply related
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2012-05-03 5:35 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Russell King
[-- Attachment #1.1: Type: text/plain, Size: 338 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/mach-ixp2000 and arch/arm/mach-ixp23xx between commits from the
arm tree and commits from the arm-soc tree.
On Russell's advise, I just removed those two directories completely.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* linux-next: manual merge of the usb tree with the input tree
From: Stephen Rothwell @ 2012-05-03 4:44 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Dmitry Torokhov, Chris Bagwell
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/input/tablet/wacom_wac.c between commit eb71d1bb270e ("Input:
wacom - use dev_xxx() instead of naked printk()s and dbg()s") from the
input tree and commit 3b6aee237e88 ("USB: wacom: remove dbg() usage")
from the usb tree.
I just used the input tree's version (which used "input->dev.parent"
instead of "&input->dev").
--
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 usb tree with the usb.current tree
From: Stephen Rothwell @ 2012-05-03 4:44 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Alan Stern, Stephen Warren,
Venu Byravarasu
[-- Attachment #1: Type: text/plain, Size: 2628 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-tegra.c between commit ebf20de45304 ("EHCI: update
PM methods in ehci-tegra.c") from the usb.current tree and commit
fe375774bd88 ("usb: host: tegra: code clean up") from the usb 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/usb/host/ehci-tegra.c
index f214a80,4c1eb61..0000000
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@@ -319,7 -423,37 +308,7 @@@ static int tegra_ehci_setup(struct usb_
return retval;
}
- struct temp_buffer {
-#ifdef CONFIG_PM
-static int tegra_ehci_bus_suspend(struct usb_hcd *hcd)
-{
- struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
- int error_status = 0;
-
- error_status = ehci_bus_suspend(hcd);
- if (!error_status && tegra->power_down_on_bus_suspend) {
- tegra_usb_suspend(hcd);
- tegra->bus_suspended = 1;
- }
-
- return error_status;
-}
-
-static int tegra_ehci_bus_resume(struct usb_hcd *hcd)
-{
- struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
-
- if (tegra->bus_suspended && tegra->power_down_on_bus_suspend) {
- tegra_usb_resume(hcd);
- tegra->bus_suspended = 0;
- }
-
- tegra_usb_phy_preresume(tegra->phy);
- tegra->port_resuming = 1;
- return ehci_bus_resume(hcd);
-}
-#endif
-
+ struct dma_aligned_buffer {
void *kmalloc_ptr;
void *old_xfer_buffer;
u8 data[0];
@@@ -426,14 -548,20 +403,20 @@@ static const struct hc_driver tegra_ehc
.endpoint_reset = ehci_endpoint_reset,
.get_frame_number = ehci_get_frame,
.hub_status_data = ehci_hub_status_data,
- .hub_control = tegra_ehci_hub_control,
.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
+ .relinquish_port = ehci_relinquish_port,
+ .port_handed_over = ehci_port_handed_over,
+
+ /* modified ehci functions for tegra */
+ .reset = tegra_ehci_setup,
+ .shutdown = tegra_ehci_shutdown,
+ .map_urb_for_dma = tegra_ehci_map_urb_for_dma,
+ .unmap_urb_for_dma = tegra_ehci_unmap_urb_for_dma,
+ .hub_control = tegra_ehci_hub_control,
#ifdef CONFIG_PM
- .bus_suspend = tegra_ehci_bus_suspend,
- .bus_resume = tegra_ehci_bus_resume,
+ .bus_suspend = ehci_bus_suspend,
+ .bus_resume = ehci_bus_resume,
#endif
- .relinquish_port = ehci_relinquish_port,
- .port_handed_over = ehci_port_handed_over,
};
static int setup_vbus_gpio(struct platform_device *pdev)
[-- 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