linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Josh <joshua.taylor0@gmail.com>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Tony Lindgren <tony@atomide.com>
Subject: linux-next: manual merge of the arm-soc tree with the input tree
Date: Mon, 17 Sep 2012 18:02:11 +1000	[thread overview]
Message-ID: <20120917180211.de28c6e4ad5ed73ae43c162e@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/input/keyboard/omap-keypad.c between commit 9e14f36bb577 ("Input:
omap-keypad - fixed formatting") from the input tree and commit
f799a3d8fe17 ("Input: omap-keypad: Remove dependencies to mach includes")
from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).  Please resist white space only patches :-(

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/input/keyboard/omap-keypad.c
index b03c5b9,2bda5f0b..0000000
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@@ -421,10 -346,9 +346,9 @@@ err4
  err3:
  	device_remove_file(&pdev->dev, &dev_attr_enable);
  err2:
 -	for (i = row_idx - 1; i >=0; i--)
 +	for (i = row_idx - 1; i >= 0; i--)
  		gpio_free(row_gpios[i]);
- err1:
 -	for (i = col_idx - 1; i >=0; i--)
 +	for (i = col_idx - 1; i >= 0; i--)
  		gpio_free(col_gpios[i]);
  
  	kfree(omap_kp);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-09-17  8:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-17  8:02 Stephen Rothwell [this message]
2013-02-18  5:01 linux-next: manual merge of the arm-soc tree with the input tree Stephen Rothwell
2013-04-16  7:00 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120917180211.de28c6e4ad5ed73ae43c162e@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=dmitry.torokhov@gmail.com \
    --cc=joshua.taylor0@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).