* linux-next: manual merge of the trivial tree with the tree
@ 2011-06-14 4:31 Stephen Rothwell
2011-06-14 8:42 ` Jiri Kosina
0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2011-06-14 4:31 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, linux-kernel, Timur Tabi, Mark Brown, Joe Perches
[-- Attachment #1: Type: text/plain, Size: 482 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
sound/soc/fsl/fsl_ssi.c between commit 147dfe90f730 ("ASoC: p1022ds: fix
incorrect referencing of device tree properties") from the sound tree and
commit 28f65c11f2ff ("treewide: Convert uses of struct resource to
resource_size(ptr)") from the trivial tree.
The former supercedes the latter.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2011-06-14 4:31 linux-next: manual merge of the trivial tree with the tree Stephen Rothwell
@ 2011-06-14 8:42 ` Jiri Kosina
0 siblings, 0 replies; 23+ messages in thread
From: Jiri Kosina @ 2011-06-14 8:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Timur Tabi, Mark Brown, Joe Perches
On Tue, 14 Jun 2011, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> sound/soc/fsl/fsl_ssi.c between commit 147dfe90f730 ("ASoC: p1022ds: fix
> incorrect referencing of device tree properties") from the sound tree and
> commit 28f65c11f2ff ("treewide: Convert uses of struct resource to
> resource_size(ptr)") from the trivial tree.
>
> The former supercedes the latter.
I have dropped the hunk from my tree, thanks for reporting.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2012-05-22 9:16 ` Jiri Kosina
@ 2012-05-22 11:53 ` John Crispin
0 siblings, 0 replies; 23+ messages in thread
From: John Crispin @ 2012-05-22 11:53 UTC (permalink / raw)
To: Jiri Kosina
Cc: Stephen Rothwell, linux-next, linux-kernel, Masanari Iida, Ralf Baechle
On 22/05/12 11:16, Jiri Kosina wrote:
> On Tue, 22 May 2012, Stephen Rothwell wrote:
>
>> Hi Jiri,
>>
>> Today's linux-next merge of the trivial tree got a conflict in
>> arch/mips/lantiq/xway/gpio_ebu.c arch/mips/lantiq/xway/gpio_stp.c between
>> commit 5238f7bc3566 ("GPIO: MIPS: lantiq: move gpio-stp and gpio-ebu to
>> the subsystem folder") from the tree and commit 6997991ab0db ("mips: Fix
>> printk typos in arc/mips") from the trivial tree.
>>
>> The typos fixed in the latter probably need to be applied to the renamed
>> files drivers/gpio/gpio-mm-lantiq.c and drivers/gpio/gpio-stp-xway.c
>> (resp).
>>
>> I have removed the old versions.
> I will probably keep this trivial conflict for Linus to resolve. Thanks,
>
Hi,
I'll try to resolve this and have the MIPS/Lantiq specifc parts flow via
Ralfs tree if no one minds
Thanks,
John
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2012-05-22 4:54 Stephen Rothwell
@ 2012-05-22 9:16 ` Jiri Kosina
2012-05-22 11:53 ` John Crispin
0 siblings, 1 reply; 23+ messages in thread
From: Jiri Kosina @ 2012-05-22 9:16 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Masanari Iida, John Crispin, Ralf Baechle
On Tue, 22 May 2012, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/mips/lantiq/xway/gpio_ebu.c arch/mips/lantiq/xway/gpio_stp.c between
> commit 5238f7bc3566 ("GPIO: MIPS: lantiq: move gpio-stp and gpio-ebu to
> the subsystem folder") from the tree and commit 6997991ab0db ("mips: Fix
> printk typos in arc/mips") from the trivial tree.
>
> The typos fixed in the latter probably need to be applied to the renamed
> files drivers/gpio/gpio-mm-lantiq.c and drivers/gpio/gpio-stp-xway.c
> (resp).
>
> I have removed the old versions.
I will probably keep this trivial conflict for Linus to resolve. Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 23+ messages in thread
* linux-next: manual merge of the trivial tree with the tree
@ 2012-05-22 4:54 Stephen Rothwell
2012-05-22 9:16 ` Jiri Kosina
0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2012-05-22 4:54 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Masanari Iida, John Crispin, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 648 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/mips/lantiq/xway/gpio_ebu.c arch/mips/lantiq/xway/gpio_stp.c between
commit 5238f7bc3566 ("GPIO: MIPS: lantiq: move gpio-stp and gpio-ebu to
the subsystem folder") from the tree and commit 6997991ab0db ("mips: Fix
printk typos in arc/mips") from the trivial tree.
The typos fixed in the latter probably need to be applied to the renamed
files drivers/gpio/gpio-mm-lantiq.c and drivers/gpio/gpio-stp-xway.c
(resp).
I have removed the old versions.
--
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 [flat|nested] 23+ messages in thread
* linux-next: manual merge of the trivial tree with the tree
@ 2011-06-14 4:25 Stephen Rothwell
0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2011-06-14 4:25 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Dmitry Eremin-Solenikov,
Artem Bityutskiy, Joe Perches
[-- Attachment #1: Type: text/plain, Size: 490 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/mtd/maps/pxa2xx-flash.c between commit 51fb8326bc12 ("mtd:
pxa2xx-flash.c: use mtd_device_parse_register") from the l2-mtd tree and
commit 28f65c11f2ff ("treewide: Convert uses of struct resource to
resource_size(ptr)") from the trivial tree.
Just context changes. I did the obvious fixup and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2010-11-09 2:27 Stephen Rothwell
@ 2010-11-19 16:08 ` Jiri Kosina
0 siblings, 0 replies; 23+ messages in thread
From: Jiri Kosina @ 2010-11-19 16:08 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, "Uwe Kleine-König",
Mike Frysinger
On Tue, 9 Nov 2010, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/blackfin/mach-bf538/include/mach/defBF539.h,
> arch/blackfin/mach-bf518/include/mach/defBF51x_base.h and
> arch/blackfin/mach-bf527/include/mach/defBF52x_base.h between various
> commits from the blackfin tree and commit
> b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
> typos") from the trivial tree.
>
> I just used the versions from the blackfin tree for now since they moved
> large amounts of code around and deleted the latter 2 files.
I have reverted those hunks in my tree, so it should be conflict-less now.
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 23+ messages in thread
* linux-next: manual merge of the trivial tree with the tree
@ 2010-11-09 2:27 Stephen Rothwell
2010-11-19 16:08 ` Jiri Kosina
0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2010-11-09 2:27 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, "Uwe Kleine-König",
Mike Frysinger
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/blackfin/mach-bf538/include/mach/defBF539.h,
arch/blackfin/mach-bf518/include/mach/defBF51x_base.h and
arch/blackfin/mach-bf527/include/mach/defBF52x_base.h between various
commits from the blackfin tree and commit
b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
typos") from the trivial tree.
I just used the versions from the blackfin tree for now since they moved
large amounts of code around and deleted the latter 2 files.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2010-02-08 4:48 Stephen Rothwell
2010-02-08 4:49 ` Stephen Rothwell
@ 2010-02-09 10:01 ` Jiri Kosina
1 sibling, 0 replies; 23+ messages in thread
From: Jiri Kosina @ 2010-02-09 10:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Daniel Mack, Manuel Lauss,
Yoichi Yuasa, Ralf Baechle
On Mon, 8 Feb 2010, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/mips/alchemy/common/reset.c between commit
> 139047ceae71916626ee36bea9ef35f1030aabfe ("MIPS: Alchemy: get rid of
> common/reset.c") from the tree and commit
> ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
> fixes") from the trivial tree.
>
> The former removes the file updated by the latter.
Thanks, I have dropped the respective hunk from the patch in my queue.
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2010-02-08 4:48 Stephen Rothwell
@ 2010-02-08 4:49 ` Stephen Rothwell
2010-02-09 10:01 ` Jiri Kosina
1 sibling, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2010-02-08 4:49 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Daniel Mack, Manuel Lauss,
Yoichi Yuasa, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 495 bytes --]
Hi Jiri,
On Mon, 8 Feb 2010 15:48:08 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/mips/alchemy/common/reset.c between commit
> 139047ceae71916626ee36bea9ef35f1030aabfe ("MIPS: Alchemy: get rid of
> common/reset.c") from the tree and commit
^
mips tree, of course.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* linux-next: manual merge of the trivial tree with the tree
@ 2010-02-08 4:48 Stephen Rothwell
2010-02-08 4:49 ` Stephen Rothwell
2010-02-09 10:01 ` Jiri Kosina
0 siblings, 2 replies; 23+ messages in thread
From: Stephen Rothwell @ 2010-02-08 4:48 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Daniel Mack, Manuel Lauss,
Yoichi Yuasa, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/mips/alchemy/common/reset.c between commit
139047ceae71916626ee36bea9ef35f1030aabfe ("MIPS: Alchemy: get rid of
common/reset.c") from the tree and commit
ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
fixes") from the trivial tree.
The former removes the file updated by the latter.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2009-11-09 15:08 ` Bartlomiej Zolnierkiewicz
@ 2009-11-09 15:25 ` Jiri Kosina
0 siblings, 0 replies; 23+ messages in thread
From: Jiri Kosina @ 2009-11-09 15:25 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz
Cc: Stephen Rothwell, John W. Linville, linux-next, linux-kernel,
Thadeu Lima de Souza Cascardo
On Mon, 9 Nov 2009, Bartlomiej Zolnierkiewicz wrote:
> > From: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
> > Subject: rt2x00: fix some typos and punctuation in comments
> >
> > fix some typos and punctuation in comments
> >
> > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
> > Signed-off-by: Jiri Kosina <jkosina@suse.cz>
>
> FWIW the patch is in rt2800 tree now.
I have dropped the respective hunk from my tree (I hope that being in your
tree means that it will get upstream one day, I must say I got completely
lost in the recent rt2x00 flames :) ).
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2009-11-09 8:45 ` Jiri Kosina
@ 2009-11-09 15:08 ` Bartlomiej Zolnierkiewicz
2009-11-09 15:25 ` Jiri Kosina
0 siblings, 1 reply; 23+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2009-11-09 15:08 UTC (permalink / raw)
To: Jiri Kosina
Cc: Stephen Rothwell, John W. Linville, linux-next, linux-kernel,
Thadeu Lima de Souza Cascardo
On Monday 09 November 2009 09:45:50 Jiri Kosina wrote:
> From: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
> Subject: rt2x00: fix some typos and punctuation in comments
>
> fix some typos and punctuation in comments
>
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
FWIW the patch is in rt2800 tree now.
--
Bartlomiej Zolnierkiewicz
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2009-11-09 4:43 Stephen Rothwell
@ 2009-11-09 8:45 ` Jiri Kosina
2009-11-09 15:08 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 23+ messages in thread
From: Jiri Kosina @ 2009-11-09 8:45 UTC (permalink / raw)
To: Stephen Rothwell, John W. Linville
Cc: linux-next, linux-kernel, Thadeu Lima de Souza Cascardo,
Bartlomiej Zolnierkiewicz
On Mon, 9 Nov 2009, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/net/wireless/rt2x00/rt2800usb.c between commit
> fcf5154118849cca3cdf424e83f863225d8173e7 ("rt2800: add rt2800lib (part
> three)") from the wireless tree and commit
> 305409a25f7df3c359ba67cbeb62763eeb7156e9 ("tree-wide: fix some typos and
> punctuation in comments") from the trivial tree.
>
> The misspelling is moved to a new file
> (drivers/net/wireless/rt2x00/rt2800lib.c), but I didn't bother fixing it up.
Sure, thanks for letting me know.
John, I think it'd be best if you just take the appropriate hunks from
that tree-wide patch into your tree, if you don't mind.
Please find the patch with extracted hunks below, and let me know if/when
you have applied it, so that I can drop it. Thanks.
From: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Subject: rt2x00: fix some typos and punctuation in comments
fix some typos and punctuation in comments
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 9fe770f..68b43e3 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -1257,7 +1257,7 @@ static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev)
unsigned int i;
/*
- * Wait untill BBP and RF are ready.
+ * Wait until BBP and RF are ready.
*/
for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
rt2x00usb_register_read(rt2x00dev, MAC_CSR0, ®);
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index b20e3ea..343e565 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -51,7 +51,7 @@ MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
* These indirect registers work with busy bits,
* and we will try maximal REGISTER_BUSY_COUNT times to access
* the register while taking a REGISTER_BUSY_DELAY us delay
- * between each attampt. When the busy bit is still set at that time,
+ * between each attempt. When the busy bit is still set at that time,
* the access attempt is considered to have failed,
* and we will print an error.
*/
@@ -386,7 +386,7 @@ static int rt61pci_config_shared_key(struct rt2x00_dev *rt2x00dev,
* The driver does not support the IV/EIV generation
* in hardware. However it doesn't support the IV/EIV
* inside the ieee80211 frame either, but requires it
- * to be provided seperately for the descriptor.
+ * to be provided separately for the descriptor.
* rt2x00lib will cut the IV/EIV data out of all frames
* given to us by mac80211, but we must tell mac80211
* to generate the IV/EIV data.
@@ -397,7 +397,7 @@ static int rt61pci_config_shared_key(struct rt2x00_dev *rt2x00dev,
/*
* SEC_CSR0 contains only single-bit fields to indicate
* a particular key is valid. Because using the FIELD32()
- * defines directly will cause a lot of overhead we use
+ * defines directly will cause a lot of overhead, we use
* a calculation to determine the correct bit directly.
*/
mask = 1 << key->hw_key_idx;
@@ -425,11 +425,11 @@ static int rt61pci_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
/*
* rt2x00lib can't determine the correct free
* key_idx for pairwise keys. We have 2 registers
- * with key valid bits. The goal is simple, read
- * the first register, if that is full move to
+ * with key valid bits. The goal is simple: read
+ * the first register. If that is full, move to
* the next register.
- * When both registers are full, we drop the key,
- * otherwise we use the first invalid entry.
+ * When both registers are full, we drop the key.
+ * Otherwise, we use the first invalid entry.
*/
rt2x00pci_register_read(rt2x00dev, SEC_CSR2, ®);
if (reg && reg == ~0) {
@@ -464,8 +464,8 @@ static int rt61pci_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
&addr_entry, sizeof(addr_entry));
/*
- * Enable pairwise lookup table for given BSS idx,
- * without this received frames will not be decrypted
+ * Enable pairwise lookup table for given BSS idx.
+ * Without this, received frames will not be decrypted
* by the hardware.
*/
rt2x00pci_register_read(rt2x00dev, SEC_CSR4, ®);
@@ -487,7 +487,7 @@ static int rt61pci_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
/*
* SEC_CSR2 and SEC_CSR3 contain only single-bit fields to indicate
* a particular key is valid. Because using the FIELD32()
- * defines directly will cause a lot of overhead we use
+ * defines directly will cause a lot of overhead, we use
* a calculation to determine the correct bit directly.
*/
if (key->hw_key_idx < 32) {
@@ -556,7 +556,7 @@ static void rt61pci_config_intf(struct rt2x00_dev *rt2x00dev,
if (flags & CONFIG_UPDATE_TYPE) {
/*
* Clear current synchronisation setup.
- * For the Beacon base registers we only need to clear
+ * For the Beacon base registers, we only need to clear
* the first byte since that byte contains the VALID and OWNER
* bits which (when set to 0) will invalidate the entire beacon.
*/
@@ -1168,8 +1168,8 @@ static int rt61pci_check_firmware(struct rt2x00_dev *rt2x00dev,
return FW_BAD_LENGTH;
/*
- * The last 2 bytes in the firmware array are the crc checksum itself,
- * this means that we should never pass those 2 bytes to the crc
+ * The last 2 bytes in the firmware array are the crc checksum itself.
+ * This means that we should never pass those 2 bytes to the crc
* algorithm.
*/
fw_crc = (data[len - 2] << 8 | data[len - 1]);
@@ -1986,7 +1986,7 @@ static void rt61pci_fill_rxdone(struct queue_entry *entry,
/*
* Hardware has stripped IV/EIV data from 802.11 frame during
- * decryption. It has provided the data seperately but rt2x00lib
+ * decryption. It has provided the data separately but rt2x00lib
* should decide if it should be reinserted.
*/
rxdesc->flags |= RX_FLAG_IV_STRIPPED;
@@ -2042,7 +2042,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
* During each loop we will compare the freshly read
* STA_CSR4 register value with the value read from
* the previous loop. If the 2 values are equal then
- * we should stop processing because the chance it
+ * we should stop processing because the chance is
* quite big that the device has been unplugged and
* we risk going into an endless loop.
*/
@@ -2330,7 +2330,7 @@ static int rt61pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
__set_bit(CONFIG_FRAME_TYPE, &rt2x00dev->flags);
/*
- * Detect if this device has an hardware controlled radio.
+ * Detect if this device has a hardware controlled radio.
*/
if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_HARDWARE_RADIO))
__set_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags);
@@ -2355,7 +2355,7 @@ static int rt61pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
__set_bit(CONFIG_EXTERNAL_LNA_BG, &rt2x00dev->flags);
/*
- * When working with a RF2529 chip without double antenna
+ * When working with a RF2529 chip without double antenna,
* the antenna settings should be gathered from the NIC
* eeprom word.
*/
@@ -2668,7 +2668,7 @@ static int rt61pci_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,
/*
* We only need to perform additional register initialization
- * for WMM queues/
+ * for WMM queues.
*/
if (queue_idx >= 4)
return 0;
^ permalink raw reply related [flat|nested] 23+ messages in thread
* linux-next: manual merge of the trivial tree with the tree
@ 2009-11-09 4:43 Stephen Rothwell
2009-11-09 8:45 ` Jiri Kosina
0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2009-11-09 4:43 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Thadeu Lima de Souza Cascardo,
Bartlomiej Zolnierkiewicz, John W. Linville
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/rt2x00/rt2800usb.c between commit
fcf5154118849cca3cdf424e83f863225d8173e7 ("rt2800: add rt2800lib (part
three)") from the wireless tree and commit
305409a25f7df3c359ba67cbeb62763eeb7156e9 ("tree-wide: fix some typos and
punctuation in comments") from the trivial tree.
The misspelling is moved to a new file
(drivers/net/wireless/rt2x00/rt2800lib.c), but I didn't bother fixing it up.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2009-08-08 0:13 ` Jiri Kosina
@ 2009-08-08 0:46 ` Stephen Rothwell
0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2009-08-08 0:46 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Joe Perches, Andrew Morton, Markus Heidelberg
[-- Attachment #1: Type: text/plain, Size: 462 bytes --]
Hi Jiri,
On Sat, 8 Aug 2009 02:13:36 +0200 (CEST) Jiri Kosina <jkosina@suse.cz> wrote:
>
> [ sorry for late reply, have been on vacation, totally offline, for two
> weeks ]
Hey, no worries :-)
> I have fast-forwarded the 'for-next' branch of trivial tree and fixed the
> conflict, so it should be OK the next time you pull.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2009-07-31 4:39 Stephen Rothwell
@ 2009-08-08 0:13 ` Jiri Kosina
2009-08-08 0:46 ` Stephen Rothwell
0 siblings, 1 reply; 23+ messages in thread
From: Jiri Kosina @ 2009-08-08 0:13 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Joe Perches, Andrew Morton, Markus Heidelberg
On Fri, 31 Jul 2009, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> MAINTAINERS between commit 24725d1ecf26ba05d74c1cc3ae7467b61a900421
> ("MAINTAINERS: Update KERNEL JANITORS") from Linus' tree and commit
> 70301b8cc8a23d57d3e6120c012c86569285efcb ("trivial: update the Kernel
> Janitors' web-page URL") from the trivial tree.
>
> Just context differences. I fixed it up (see below) and can carry the
> fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc MAINTAINERS
> index fa86fd5,354cc16..0000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -2912,13 -3374,16 +2912,13 @@@ F: Makefil
> F: scripts/Makefile.*
>
> KERNEL JANITORS
> -P: Several
> L: kernel-janitors@vger.kernel.org
> - W: http://www.kerneljanitors.org/
> + W: http://janitor.kernelnewbies.org/
> -S: Maintained
> +S: Odd fixes
>
> KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
> -P: J. Bruce Fields
> -M: bfields@fieldses.org
> -P: Neil Brown
> -M: neilb@suse.de
> +M: "J. Bruce Fields" <bfields@fieldses.org>
> +M: Neil Brown <neilb@suse.de>
> L: linux-nfs@vger.kernel.org
> W: http://nfs.sourceforge.net/
> S: Supported
[ sorry for late reply, have been on vacation, totally offline, for two
weeks ]
I have fast-forwarded the 'for-next' branch of trivial tree and fixed the
conflict, so it should be OK the next time you pull.
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 23+ messages in thread
* linux-next: manual merge of the trivial tree with the tree
@ 2009-07-31 4:39 Stephen Rothwell
2009-08-08 0:13 ` Jiri Kosina
0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2009-07-31 4:39 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Joe Perches, Andrew Morton, Markus Heidelberg
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
MAINTAINERS between commit 24725d1ecf26ba05d74c1cc3ae7467b61a900421
("MAINTAINERS: Update KERNEL JANITORS") from Linus' tree and commit
70301b8cc8a23d57d3e6120c012c86569285efcb ("trivial: update the Kernel
Janitors' web-page URL") from the trivial tree.
Just context differences. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc MAINTAINERS
index fa86fd5,354cc16..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2912,13 -3374,16 +2912,13 @@@ F: Makefil
F: scripts/Makefile.*
KERNEL JANITORS
-P: Several
L: kernel-janitors@vger.kernel.org
- W: http://www.kerneljanitors.org/
+ W: http://janitor.kernelnewbies.org/
-S: Maintained
+S: Odd fixes
KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
-P: J. Bruce Fields
-M: bfields@fieldses.org
-P: Neil Brown
-M: neilb@suse.de
+M: "J. Bruce Fields" <bfields@fieldses.org>
+M: Neil Brown <neilb@suse.de>
L: linux-nfs@vger.kernel.org
W: http://nfs.sourceforge.net/
S: Supported
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2009-03-12 4:43 Stephen Rothwell
@ 2009-03-12 10:27 ` Jiri Kosina
0 siblings, 0 replies; 23+ messages in thread
From: Jiri Kosina @ 2009-03-12 10:27 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Randy Dunlap, Matt LaPlante
On Thu, 12 Mar 2009, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> init/Kconfig between commit b943c460ff8556a193b28e2145b513f8b978e869
> ("menu: fix embedded menu snafu") from Linus' tree and commit
> 2622b54dff6e30d114828648e96777739b764063 ("trivial: fix typos/grammar
> errors in Kconfig texts") from the trivial tree.
Hi,
the trivial tree is now based on current Linus' tree (ebdcc81c). Strangely
enough, I didn't encounter any conflict while doing rebase ...
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 23+ messages in thread
* linux-next: manual merge of the trivial tree with the tree
@ 2009-03-12 4:43 Stephen Rothwell
2009-03-12 10:27 ` Jiri Kosina
0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2009-03-12 4:43 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, Randy Dunlap, Matt LaPlante
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
init/Kconfig between commit b943c460ff8556a193b28e2145b513f8b978e869
("menu: fix embedded menu snafu") from Linus' tree and commit
2622b54dff6e30d114828648e96777739b764063 ("trivial: fix typos/grammar
errors in Kconfig texts") from the trivial tree.
The former moved the text that the latter modified. I fixed it up (see
below) and carry it for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc init/Kconfig
index 68c23f3,12b1343..0000000
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -945,21 -897,9 +945,21 @@@ config SLUB_DEBU
SLUB sysfs support. /sys/slab will not exist and there will be
no support for cache validation etc.
+config COMPAT_BRK
+ bool "Disable heap randomization"
+ default y
+ help
+ Randomizing heap placement makes heap exploits harder, but it
+ also breaks ancient binaries (including anything libc5 based).
+ This option changes the bootup default to heap randomization
- disabled, and can be overriden runtime by setting
++ disabled, and can be overridden at runtime by setting
+ /proc/sys/kernel/randomize_va_space to 2.
+
+ On non-ancient distros (post-2000 ones) N is usually a safe choice.
+
choice
prompt "Choose SLAB allocator"
- default SLUB
+ default SLQB
help
This option allows to select a slab allocator.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2009-02-05 12:59 ` Jiri Kosina
@ 2009-02-05 22:23 ` Stephen Rothwell
0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2009-02-05 22:23 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, Nick Andrew, Tejun Heo, Jeff Garzik
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
Hi Jiri,
On Thu, 5 Feb 2009 13:59:40 +0100 (CET) Jiri Kosina <jkosina@suse.cz> wrote:
>
> Thanks. As the libata patch is apparently now in Linus' tree, I have now
> resolved this conflict in my tree, so you should be able to drop this
> fixup in the next round of linux-next merging.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the tree
2009-02-04 6:59 Stephen Rothwell
@ 2009-02-05 12:59 ` Jiri Kosina
2009-02-05 22:23 ` Stephen Rothwell
0 siblings, 1 reply; 23+ messages in thread
From: Jiri Kosina @ 2009-02-05 12:59 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Nick Andrew, Tejun Heo, Jeff Garzik
On Wed, 4 Feb 2009, Stephen Rothwell wrote:
> 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.
Thanks. As the libata patch is apparently now in Linus' tree, I have now
resolved this conflict in my tree, so you should be able to drop this
fixup in the next round of linux-next merging.
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 23+ messages in thread
* linux-next: manual merge of the trivial tree with the tree
@ 2009-02-04 6:59 Stephen Rothwell
2009-02-05 12:59 ` Jiri Kosina
0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2009-02-04 6:59 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, Nick Andrew, Tejun Heo, Jeff Garzik
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 */
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2012-05-22 11:54 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-14 4:31 linux-next: manual merge of the trivial tree with the tree Stephen Rothwell
2011-06-14 8:42 ` Jiri Kosina
-- strict thread matches above, loose matches on Subject: below --
2012-05-22 4:54 Stephen Rothwell
2012-05-22 9:16 ` Jiri Kosina
2012-05-22 11:53 ` John Crispin
2011-06-14 4:25 Stephen Rothwell
2010-11-09 2:27 Stephen Rothwell
2010-11-19 16:08 ` Jiri Kosina
2010-02-08 4:48 Stephen Rothwell
2010-02-08 4:49 ` Stephen Rothwell
2010-02-09 10:01 ` Jiri Kosina
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
2009-07-31 4:39 Stephen Rothwell
2009-08-08 0:13 ` Jiri Kosina
2009-08-08 0:46 ` Stephen Rothwell
2009-03-12 4:43 Stephen Rothwell
2009-03-12 10:27 ` Jiri Kosina
2009-02-04 6:59 Stephen Rothwell
2009-02-05 12:59 ` Jiri Kosina
2009-02-05 22:23 ` Stephen Rothwell
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.