All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-next@vger.kernel.org, Nick Andrew <nick@nick-andrew.net>,
	Tejun Heo <tj@kernel.org>, Jeff Garzik <jgarzik@redhat.com>
Subject: linux-next: manual merge of the trivial tree with the  tree
Date: Wed, 4 Feb 2009 17:59:05 +1100	[thread overview]
Message-ID: <20090204175905.09624475.sfr@canb.auug.org.au> (raw)

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
include/linux/libata.h between commit
9062712fa9ed13b531dfc2228086650b8bd6a255 ("libata: implement
HORKAGE_1_5_GBPS and apply it to WD My Book") from the libata tree tree
and commit 71e75a63456e0bb39afcae3c28dd5e211fb2b637 ("trivial: Fix
misspelling of firmware") from the trivial tree.

Juts trivial context overlap.  I fixed it up (see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc include/linux/libata.h
index 5d87bc0,2632f8e..0000000
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -379,8 -379,7 +379,8 @@@ enum 
  	ATA_HORKAGE_BRIDGE_OK	= (1 << 10),	/* no bridge limits */
  	ATA_HORKAGE_ATAPI_MOD16_DMA = (1 << 11), /* use ATAPI DMA for commands
  						    not multiple of 16 bytes */
- 	ATA_HORKAGE_FIRMWARE_WARN = (1 << 12),	/* firwmare update warning */
+ 	ATA_HORKAGE_FIRMWARE_WARN = (1 << 12),	/* firmware update warning */
 +	ATA_HORKAGE_1_5_GBPS	= (1 << 13),	/* force 1.5 Gbps */
  
  	 /* DMA mask for user DMA control: User visible values; DO NOT
  	    renumber */

             reply	other threads:[~2009-02-04  6:59 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-04  6:59 Stephen Rothwell [this message]
2009-02-05 12:59 ` linux-next: manual merge of the trivial tree with the tree Jiri Kosina
2009-02-05 22:23   ` Stephen Rothwell
2009-03-12  4:43 Stephen Rothwell
2009-03-12 10:27 ` Jiri Kosina
2009-07-31  4:39 Stephen Rothwell
2009-08-08  0:13 ` Jiri Kosina
2009-08-08  0:46   ` Stephen Rothwell
2009-11-09  4:43 Stephen Rothwell
2009-11-09  8:45 ` Jiri Kosina
2009-11-09 15:08   ` Bartlomiej Zolnierkiewicz
2009-11-09 15:25     ` Jiri Kosina
2010-02-08  4:48 Stephen Rothwell
2010-02-08  4:49 ` Stephen Rothwell
2010-02-09 10:01 ` Jiri Kosina
2010-11-09  2:27 Stephen Rothwell
2010-11-19 16:08 ` Jiri Kosina
2011-06-14  4:25 Stephen Rothwell
2011-06-14  4:31 Stephen Rothwell
2011-06-14  8:42 ` Jiri Kosina
2012-05-22  4:54 Stephen Rothwell
2012-05-22  9:16 ` Jiri Kosina
2012-05-22 11:53   ` John Crispin

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=20090204175905.09624475.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=jgarzik@redhat.com \
    --cc=jkosina@suse.cz \
    --cc=linux-next@vger.kernel.org \
    --cc=nick@nick-andrew.net \
    --cc=tj@kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.